diff --git a/.gitmodules b/.gitmodules index 791404344ef3a..1ef3c086a1c23 100644 --- a/.gitmodules +++ b/.gitmodules @@ -23,7 +23,7 @@ url = /~https://github.com/rust-lang-nursery/nomicon.git [submodule "src/tools/cargo"] path = src/tools/cargo - url = /~https://github.com/rust-lang/cargo + url = /~https://github.com/rust-lang/cargo.git [submodule "reference"] path = src/doc/reference url = /~https://github.com/rust-lang-nursery/reference.git @@ -32,4 +32,4 @@ url = /~https://github.com/rust-lang/book.git [submodule "src/tools/rls"] path = src/tools/rls - url = /~https://github.com/rust-lang-nursery/rls + url = /~https://github.com/rust-lang-nursery/rls.git diff --git a/src/Cargo.lock b/src/Cargo.lock index c9de8f9900865..804fd5807735f 100644 --- a/src/Cargo.lock +++ b/src/Cargo.lock @@ -6,6 +6,23 @@ dependencies = [ "libc 0.0.0", ] +[[package]] +name = "advapi32-sys" +version = "0.2.0" +source = "registry+/~https://github.com/rust-lang/crates.io-index" +dependencies = [ + "winapi 0.2.8 (registry+/~https://github.com/rust-lang/crates.io-index)", + "winapi-build 0.1.1 (registry+/~https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "aho-corasick" +version = "0.5.3" +source = "registry+/~https://github.com/rust-lang/crates.io-index" +dependencies = [ + "memchr 0.1.11 (registry+/~https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "aho-corasick" version = "0.6.3" @@ -48,16 +65,6 @@ source = "registry+/~https://github.com/rust-lang/crates.io-index" name = "arena" version = "0.0.0" -[[package]] -name = "atty" -version = "0.2.2" -source = "registry+/~https://github.com/rust-lang/crates.io-index" -dependencies = [ - "kernel32-sys 0.2.2 (registry+/~https://github.com/rust-lang/crates.io-index)", - "libc 0.2.21 (registry+/~https://github.com/rust-lang/crates.io-index)", - "winapi 0.2.8 (registry+/~https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "backtrace" version = "0.3.0" @@ -67,7 +74,7 @@ dependencies = [ "cfg-if 0.1.0 (registry+/~https://github.com/rust-lang/crates.io-index)", "dbghelp-sys 0.2.0 (registry+/~https://github.com/rust-lang/crates.io-index)", "kernel32-sys 0.2.2 (registry+/~https://github.com/rust-lang/crates.io-index)", - "libc 0.2.21 (registry+/~https://github.com/rust-lang/crates.io-index)", + "libc 0.2.22 (registry+/~https://github.com/rust-lang/crates.io-index)", "rustc-demangle 0.1.4 (registry+/~https://github.com/rust-lang/crates.io-index)", "winapi 0.2.8 (registry+/~https://github.com/rust-lang/crates.io-index)", ] @@ -78,7 +85,7 @@ version = "0.1.10" source = "registry+/~https://github.com/rust-lang/crates.io-index" dependencies = [ "gcc 0.3.46 (registry+/~https://github.com/rust-lang/crates.io-index)", - "libc 0.2.21 (registry+/~https://github.com/rust-lang/crates.io-index)", + "libc 0.2.22 (registry+/~https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -86,6 +93,11 @@ name = "bitflags" version = "0.5.0" source = "registry+/~https://github.com/rust-lang/crates.io-index" +[[package]] +name = "bitflags" +version = "0.7.0" +source = "registry+/~https://github.com/rust-lang/crates.io-index" + [[package]] name = "bitflags" version = "0.8.2" @@ -100,17 +112,22 @@ dependencies = [ "filetime 0.1.10 (registry+/~https://github.com/rust-lang/crates.io-index)", "gcc 0.3.46 (registry+/~https://github.com/rust-lang/crates.io-index)", "getopts 0.2.14 (registry+/~https://github.com/rust-lang/crates.io-index)", - "libc 0.2.21 (registry+/~https://github.com/rust-lang/crates.io-index)", + "libc 0.2.22 (registry+/~https://github.com/rust-lang/crates.io-index)", "num_cpus 1.4.0 (registry+/~https://github.com/rust-lang/crates.io-index)", - "rustc-serialize 0.3.23 (registry+/~https://github.com/rust-lang/crates.io-index)", + "rustc-serialize 0.3.24 (registry+/~https://github.com/rust-lang/crates.io-index)", "toml 0.1.30 (registry+/~https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "bufstream" +version = "0.1.3" +source = "registry+/~https://github.com/rust-lang/crates.io-index" + [[package]] name = "build-manifest" version = "0.1.0" dependencies = [ - "rustc-serialize 0.3.23 (registry+/~https://github.com/rust-lang/crates.io-index)", + "rustc-serialize 0.3.24 (registry+/~https://github.com/rust-lang/crates.io-index)", "toml 0.1.30 (registry+/~https://github.com/rust-lang/crates.io-index)", ] @@ -121,6 +138,78 @@ dependencies = [ "filetime 0.1.10 (registry+/~https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "cargo" +version = "0.20.0" +source = "git+/~https://github.com/rust-lang/cargo#2b32084293d8da63b48de56363a0f2e986ec3367" +replace = "cargo 0.20.0" + +[[package]] +name = "cargo" +version = "0.20.0" +dependencies = [ + "advapi32-sys 0.2.0 (registry+/~https://github.com/rust-lang/crates.io-index)", + "bufstream 0.1.3 (registry+/~https://github.com/rust-lang/crates.io-index)", + "cargotest 0.1.0", + "chrono 0.3.1 (registry+/~https://github.com/rust-lang/crates.io-index)", + "crates-io 0.9.0", + "crossbeam 0.2.10 (registry+/~https://github.com/rust-lang/crates.io-index)", + "curl 0.4.6 (registry+/~https://github.com/rust-lang/crates.io-index)", + "docopt 0.7.0 (registry+/~https://github.com/rust-lang/crates.io-index)", + "env_logger 0.4.2 (registry+/~https://github.com/rust-lang/crates.io-index)", + "filetime 0.1.10 (registry+/~https://github.com/rust-lang/crates.io-index)", + "flate2 0.2.19 (registry+/~https://github.com/rust-lang/crates.io-index)", + "fs2 0.4.1 (registry+/~https://github.com/rust-lang/crates.io-index)", + "git2 0.6.5 (registry+/~https://github.com/rust-lang/crates.io-index)", + "git2-curl 0.7.0 (registry+/~https://github.com/rust-lang/crates.io-index)", + "glob 0.2.11 (registry+/~https://github.com/rust-lang/crates.io-index)", + "hamcrest 0.1.1 (registry+/~https://github.com/rust-lang/crates.io-index)", + "kernel32-sys 0.2.2 (registry+/~https://github.com/rust-lang/crates.io-index)", + "libc 0.2.22 (registry+/~https://github.com/rust-lang/crates.io-index)", + "libgit2-sys 0.6.10 (registry+/~https://github.com/rust-lang/crates.io-index)", + "log 0.3.7 (registry+/~https://github.com/rust-lang/crates.io-index)", + "miow 0.2.1 (registry+/~https://github.com/rust-lang/crates.io-index)", + "num_cpus 1.4.0 (registry+/~https://github.com/rust-lang/crates.io-index)", + "openssl 0.9.12 (registry+/~https://github.com/rust-lang/crates.io-index)", + "psapi-sys 0.1.0 (registry+/~https://github.com/rust-lang/crates.io-index)", + "rustc-serialize 0.3.24 (registry+/~https://github.com/rust-lang/crates.io-index)", + "semver 0.6.0 (registry+/~https://github.com/rust-lang/crates.io-index)", + "serde 1.0.6 (registry+/~https://github.com/rust-lang/crates.io-index)", + "serde_derive 1.0.6 (registry+/~https://github.com/rust-lang/crates.io-index)", + "serde_ignored 0.0.3 (registry+/~https://github.com/rust-lang/crates.io-index)", + "serde_json 1.0.2 (registry+/~https://github.com/rust-lang/crates.io-index)", + "shell-escape 0.1.3 (registry+/~https://github.com/rust-lang/crates.io-index)", + "tar 0.4.12 (registry+/~https://github.com/rust-lang/crates.io-index)", + "tempdir 0.3.5 (registry+/~https://github.com/rust-lang/crates.io-index)", + "term 0.4.5 (registry+/~https://github.com/rust-lang/crates.io-index)", + "toml 0.4.1 (registry+/~https://github.com/rust-lang/crates.io-index)", + "url 1.4.0 (registry+/~https://github.com/rust-lang/crates.io-index)", + "winapi 0.2.8 (registry+/~https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "cargotest" +version = "0.1.0" +dependencies = [ + "bufstream 0.1.3 (registry+/~https://github.com/rust-lang/crates.io-index)", + "cargo 0.20.0", + "filetime 0.1.10 (registry+/~https://github.com/rust-lang/crates.io-index)", + "flate2 0.2.19 (registry+/~https://github.com/rust-lang/crates.io-index)", + "git2 0.6.5 (registry+/~https://github.com/rust-lang/crates.io-index)", + "hamcrest 0.1.1 (registry+/~https://github.com/rust-lang/crates.io-index)", + "kernel32-sys 0.2.2 (registry+/~https://github.com/rust-lang/crates.io-index)", + "libc 0.2.22 (registry+/~https://github.com/rust-lang/crates.io-index)", + "log 0.3.7 (registry+/~https://github.com/rust-lang/crates.io-index)", + "rustc-serialize 0.3.24 (registry+/~https://github.com/rust-lang/crates.io-index)", + "serde 1.0.6 (registry+/~https://github.com/rust-lang/crates.io-index)", + "serde_json 1.0.2 (registry+/~https://github.com/rust-lang/crates.io-index)", + "tar 0.4.12 (registry+/~https://github.com/rust-lang/crates.io-index)", + "tempdir 0.3.5 (registry+/~https://github.com/rust-lang/crates.io-index)", + "term 0.4.5 (registry+/~https://github.com/rust-lang/crates.io-index)", + "url 1.4.0 (registry+/~https://github.com/rust-lang/crates.io-index)", + "winapi 0.2.8 (registry+/~https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "cargotest2" version = "0.1.0" @@ -130,19 +219,28 @@ name = "cfg-if" version = "0.1.0" source = "registry+/~https://github.com/rust-lang/crates.io-index" +[[package]] +name = "chrono" +version = "0.3.1" +source = "registry+/~https://github.com/rust-lang/crates.io-index" +dependencies = [ + "num 0.1.37 (registry+/~https://github.com/rust-lang/crates.io-index)", + "time 0.1.37 (registry+/~https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "clap" -version = "2.22.1" +version = "2.19.3" source = "registry+/~https://github.com/rust-lang/crates.io-index" dependencies = [ "ansi_term 0.9.0 (registry+/~https://github.com/rust-lang/crates.io-index)", - "atty 0.2.2 (registry+/~https://github.com/rust-lang/crates.io-index)", - "bitflags 0.8.2 (registry+/~https://github.com/rust-lang/crates.io-index)", - "strsim 0.6.0 (registry+/~https://github.com/rust-lang/crates.io-index)", + "bitflags 0.7.0 (registry+/~https://github.com/rust-lang/crates.io-index)", + "libc 0.2.22 (registry+/~https://github.com/rust-lang/crates.io-index)", + "strsim 0.5.2 (registry+/~https://github.com/rust-lang/crates.io-index)", "term_size 0.2.3 (registry+/~https://github.com/rust-lang/crates.io-index)", - "unicode-segmentation 1.1.0 (registry+/~https://github.com/rust-lang/crates.io-index)", + "unicode-segmentation 0.1.3 (registry+/~https://github.com/rust-lang/crates.io-index)", "unicode-width 0.1.4 (registry+/~https://github.com/rust-lang/crates.io-index)", - "vec_map 0.7.0 (registry+/~https://github.com/rust-lang/crates.io-index)", + "vec_map 0.6.0 (registry+/~https://github.com/rust-lang/crates.io-index)", "yaml-rust 0.3.5 (registry+/~https://github.com/rust-lang/crates.io-index)", ] @@ -180,13 +278,54 @@ dependencies = [ "env_logger 0.4.2 (registry+/~https://github.com/rust-lang/crates.io-index)", "filetime 0.1.10 (registry+/~https://github.com/rust-lang/crates.io-index)", "log 0.3.7 (registry+/~https://github.com/rust-lang/crates.io-index)", - "rustc-serialize 0.3.23 (registry+/~https://github.com/rust-lang/crates.io-index)", + "rustc-serialize 0.3.24 (registry+/~https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "core" version = "0.0.0" +[[package]] +name = "crates-io" +version = "0.9.0" +dependencies = [ + "curl 0.4.6 (registry+/~https://github.com/rust-lang/crates.io-index)", + "serde 1.0.6 (registry+/~https://github.com/rust-lang/crates.io-index)", + "serde_derive 1.0.6 (registry+/~https://github.com/rust-lang/crates.io-index)", + "serde_json 1.0.2 (registry+/~https://github.com/rust-lang/crates.io-index)", + "url 1.4.0 (registry+/~https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "crossbeam" +version = "0.2.10" +source = "registry+/~https://github.com/rust-lang/crates.io-index" + +[[package]] +name = "curl" +version = "0.4.6" +source = "registry+/~https://github.com/rust-lang/crates.io-index" +dependencies = [ + "curl-sys 0.3.11 (registry+/~https://github.com/rust-lang/crates.io-index)", + "libc 0.2.22 (registry+/~https://github.com/rust-lang/crates.io-index)", + "openssl-probe 0.1.1 (registry+/~https://github.com/rust-lang/crates.io-index)", + "openssl-sys 0.9.12 (registry+/~https://github.com/rust-lang/crates.io-index)", + "winapi 0.2.8 (registry+/~https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "curl-sys" +version = "0.3.11" +source = "registry+/~https://github.com/rust-lang/crates.io-index" +dependencies = [ + "gcc 0.3.46 (registry+/~https://github.com/rust-lang/crates.io-index)", + "libc 0.2.22 (registry+/~https://github.com/rust-lang/crates.io-index)", + "libz-sys 1.0.13 (registry+/~https://github.com/rust-lang/crates.io-index)", + "openssl-sys 0.9.12 (registry+/~https://github.com/rust-lang/crates.io-index)", + "pkg-config 0.3.9 (registry+/~https://github.com/rust-lang/crates.io-index)", + "winapi 0.2.8 (registry+/~https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "dbghelp-sys" version = "0.2.0" @@ -196,16 +335,58 @@ dependencies = [ "winapi-build 0.1.1 (registry+/~https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "derive-new" +version = "0.3.0" +source = "registry+/~https://github.com/rust-lang/crates.io-index" +dependencies = [ + "quote 0.2.3 (registry+/~https://github.com/rust-lang/crates.io-index)", + "syn 0.8.7 (registry+/~https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "diff" version = "0.1.10" source = "registry+/~https://github.com/rust-lang/crates.io-index" +[[package]] +name = "docopt" +version = "0.7.0" +source = "registry+/~https://github.com/rust-lang/crates.io-index" +dependencies = [ + "lazy_static 0.2.8 (registry+/~https://github.com/rust-lang/crates.io-index)", + "regex 0.2.1 (registry+/~https://github.com/rust-lang/crates.io-index)", + "rustc-serialize 0.3.24 (registry+/~https://github.com/rust-lang/crates.io-index)", + "strsim 0.6.0 (registry+/~https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "dtoa" version = "0.4.1" source = "registry+/~https://github.com/rust-lang/crates.io-index" +[[package]] +name = "either" +version = "1.1.0" +source = "registry+/~https://github.com/rust-lang/crates.io-index" + +[[package]] +name = "enum_primitive" +version = "0.1.1" +source = "registry+/~https://github.com/rust-lang/crates.io-index" +dependencies = [ + "num-traits 0.1.37 (registry+/~https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "env_logger" +version = "0.3.5" +source = "registry+/~https://github.com/rust-lang/crates.io-index" +dependencies = [ + "log 0.3.7 (registry+/~https://github.com/rust-lang/crates.io-index)", + "regex 0.1.80 (registry+/~https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "env_logger" version = "0.4.2" @@ -232,7 +413,7 @@ name = "filetime" version = "0.1.10" source = "registry+/~https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.21 (registry+/~https://github.com/rust-lang/crates.io-index)", + "libc 0.2.22 (registry+/~https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -248,7 +429,7 @@ name = "flate2" version = "0.2.19" source = "registry+/~https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.21 (registry+/~https://github.com/rust-lang/crates.io-index)", + "libc 0.2.22 (registry+/~https://github.com/rust-lang/crates.io-index)", "miniz-sys 0.1.9 (registry+/~https://github.com/rust-lang/crates.io-index)", ] @@ -256,11 +437,35 @@ dependencies = [ name = "fmt_macros" version = "0.0.0" +[[package]] +name = "foreign-types" +version = "0.2.0" +source = "registry+/~https://github.com/rust-lang/crates.io-index" + +[[package]] +name = "fs2" +version = "0.4.1" +source = "registry+/~https://github.com/rust-lang/crates.io-index" +dependencies = [ + "kernel32-sys 0.2.2 (registry+/~https://github.com/rust-lang/crates.io-index)", + "libc 0.2.22 (registry+/~https://github.com/rust-lang/crates.io-index)", + "winapi 0.2.8 (registry+/~https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "gcc" version = "0.3.46" source = "registry+/~https://github.com/rust-lang/crates.io-index" +[[package]] +name = "gdi32-sys" +version = "0.2.0" +source = "registry+/~https://github.com/rust-lang/crates.io-index" +dependencies = [ + "winapi 0.2.8 (registry+/~https://github.com/rust-lang/crates.io-index)", + "winapi-build 0.1.1 (registry+/~https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "getopts" version = "0.0.0" @@ -270,29 +475,77 @@ name = "getopts" version = "0.2.14" source = "registry+/~https://github.com/rust-lang/crates.io-index" +[[package]] +name = "git2" +version = "0.6.5" +source = "registry+/~https://github.com/rust-lang/crates.io-index" +dependencies = [ + "bitflags 0.7.0 (registry+/~https://github.com/rust-lang/crates.io-index)", + "libc 0.2.22 (registry+/~https://github.com/rust-lang/crates.io-index)", + "libgit2-sys 0.6.10 (registry+/~https://github.com/rust-lang/crates.io-index)", + "openssl-probe 0.1.1 (registry+/~https://github.com/rust-lang/crates.io-index)", + "openssl-sys 0.9.12 (registry+/~https://github.com/rust-lang/crates.io-index)", + "url 1.4.0 (registry+/~https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "git2-curl" +version = "0.7.0" +source = "registry+/~https://github.com/rust-lang/crates.io-index" +dependencies = [ + "curl 0.4.6 (registry+/~https://github.com/rust-lang/crates.io-index)", + "git2 0.6.5 (registry+/~https://github.com/rust-lang/crates.io-index)", + "log 0.3.7 (registry+/~https://github.com/rust-lang/crates.io-index)", + "url 1.4.0 (registry+/~https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "glob" +version = "0.2.11" +source = "registry+/~https://github.com/rust-lang/crates.io-index" + [[package]] name = "graphviz" version = "0.0.0" +[[package]] +name = "hamcrest" +version = "0.1.1" +source = "registry+/~https://github.com/rust-lang/crates.io-index" +dependencies = [ + "num 0.1.37 (registry+/~https://github.com/rust-lang/crates.io-index)", + "regex 0.1.80 (registry+/~https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "handlebars" -version = "0.25.2" +version = "0.25.3" source = "registry+/~https://github.com/rust-lang/crates.io-index" dependencies = [ "lazy_static 0.2.8 (registry+/~https://github.com/rust-lang/crates.io-index)", "log 0.3.7 (registry+/~https://github.com/rust-lang/crates.io-index)", "pest 0.3.3 (registry+/~https://github.com/rust-lang/crates.io-index)", - "quick-error 1.1.0 (registry+/~https://github.com/rust-lang/crates.io-index)", + "quick-error 1.2.0 (registry+/~https://github.com/rust-lang/crates.io-index)", "regex 0.2.1 (registry+/~https://github.com/rust-lang/crates.io-index)", - "rustc-serialize 0.3.23 (registry+/~https://github.com/rust-lang/crates.io-index)", - "serde_json 0.9.9 (registry+/~https://github.com/rust-lang/crates.io-index)", + "rustc-serialize 0.3.24 (registry+/~https://github.com/rust-lang/crates.io-index)", + "serde_json 0.9.10 (registry+/~https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "idna" +version = "0.1.1" +source = "registry+/~https://github.com/rust-lang/crates.io-index" +dependencies = [ + "matches 0.1.4 (registry+/~https://github.com/rust-lang/crates.io-index)", + "unicode-bidi 0.2.5 (registry+/~https://github.com/rust-lang/crates.io-index)", + "unicode-normalization 0.1.4 (registry+/~https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "installer" version = "0.0.0" dependencies = [ - "clap 2.22.1 (registry+/~https://github.com/rust-lang/crates.io-index)", + "clap 2.19.3 (registry+/~https://github.com/rust-lang/crates.io-index)", "error-chain 0.10.0 (registry+/~https://github.com/rust-lang/crates.io-index)", "flate2 0.2.19 (registry+/~https://github.com/rust-lang/crates.io-index)", "kernel32-sys 0.2.2 (registry+/~https://github.com/rust-lang/crates.io-index)", @@ -303,6 +556,14 @@ dependencies = [ "xz2 0.1.3 (registry+/~https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "itertools" +version = "0.5.10" +source = "registry+/~https://github.com/rust-lang/crates.io-index" +dependencies = [ + "either 1.1.0 (registry+/~https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "itoa" version = "0.3.1" @@ -317,6 +578,19 @@ dependencies = [ "winapi-build 0.1.1 (registry+/~https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "languageserver-types" +version = "0.10.0" +source = "registry+/~https://github.com/rust-lang/crates.io-index" +dependencies = [ + "enum_primitive 0.1.1 (registry+/~https://github.com/rust-lang/crates.io-index)", + "serde 1.0.6 (registry+/~https://github.com/rust-lang/crates.io-index)", + "serde_derive 1.0.6 (registry+/~https://github.com/rust-lang/crates.io-index)", + "serde_json 1.0.2 (registry+/~https://github.com/rust-lang/crates.io-index)", + "url 1.4.0 (registry+/~https://github.com/rust-lang/crates.io-index)", + "url_serde 0.2.0 (registry+/~https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "lazy_static" version = "0.2.8" @@ -331,9 +605,46 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.21" +version = "0.2.22" source = "registry+/~https://github.com/rust-lang/crates.io-index" +[[package]] +name = "libgit2-sys" +version = "0.6.10" +source = "registry+/~https://github.com/rust-lang/crates.io-index" +dependencies = [ + "cmake 0.1.23 (registry+/~https://github.com/rust-lang/crates.io-index)", + "curl-sys 0.3.11 (registry+/~https://github.com/rust-lang/crates.io-index)", + "gcc 0.3.46 (registry+/~https://github.com/rust-lang/crates.io-index)", + "libc 0.2.22 (registry+/~https://github.com/rust-lang/crates.io-index)", + "libssh2-sys 0.2.6 (registry+/~https://github.com/rust-lang/crates.io-index)", + "libz-sys 1.0.13 (registry+/~https://github.com/rust-lang/crates.io-index)", + "openssl-sys 0.9.12 (registry+/~https://github.com/rust-lang/crates.io-index)", + "pkg-config 0.3.9 (registry+/~https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "libssh2-sys" +version = "0.2.6" +source = "registry+/~https://github.com/rust-lang/crates.io-index" +dependencies = [ + "cmake 0.1.23 (registry+/~https://github.com/rust-lang/crates.io-index)", + "libc 0.2.22 (registry+/~https://github.com/rust-lang/crates.io-index)", + "libz-sys 1.0.13 (registry+/~https://github.com/rust-lang/crates.io-index)", + "openssl-sys 0.9.12 (registry+/~https://github.com/rust-lang/crates.io-index)", + "pkg-config 0.3.9 (registry+/~https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "libz-sys" +version = "1.0.13" +source = "registry+/~https://github.com/rust-lang/crates.io-index" +dependencies = [ + "gcc 0.3.46 (registry+/~https://github.com/rust-lang/crates.io-index)", + "libc 0.2.22 (registry+/~https://github.com/rust-lang/crates.io-index)", + "pkg-config 0.3.9 (registry+/~https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "linkchecker" version = "0.1.0" @@ -350,24 +661,37 @@ source = "registry+/~https://github.com/rust-lang/crates.io-index" dependencies = [ "filetime 0.1.10 (registry+/~https://github.com/rust-lang/crates.io-index)", "gcc 0.3.46 (registry+/~https://github.com/rust-lang/crates.io-index)", - "libc 0.2.21 (registry+/~https://github.com/rust-lang/crates.io-index)", + "libc 0.2.22 (registry+/~https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "matches" +version = "0.1.4" +source = "registry+/~https://github.com/rust-lang/crates.io-index" + [[package]] name = "mdbook" version = "0.0.21" source = "registry+/~https://github.com/rust-lang/crates.io-index" dependencies = [ - "clap 2.22.1 (registry+/~https://github.com/rust-lang/crates.io-index)", + "clap 2.19.3 (registry+/~https://github.com/rust-lang/crates.io-index)", "env_logger 0.4.2 (registry+/~https://github.com/rust-lang/crates.io-index)", - "handlebars 0.25.2 (registry+/~https://github.com/rust-lang/crates.io-index)", + "handlebars 0.25.3 (registry+/~https://github.com/rust-lang/crates.io-index)", "log 0.3.7 (registry+/~https://github.com/rust-lang/crates.io-index)", "open 1.2.0 (registry+/~https://github.com/rust-lang/crates.io-index)", "pulldown-cmark 0.0.8 (registry+/~https://github.com/rust-lang/crates.io-index)", "regex 0.2.1 (registry+/~https://github.com/rust-lang/crates.io-index)", - "serde 0.9.11 (registry+/~https://github.com/rust-lang/crates.io-index)", - "serde_json 0.9.9 (registry+/~https://github.com/rust-lang/crates.io-index)", - "toml 0.3.1 (registry+/~https://github.com/rust-lang/crates.io-index)", + "serde 0.9.15 (registry+/~https://github.com/rust-lang/crates.io-index)", + "serde_json 0.9.10 (registry+/~https://github.com/rust-lang/crates.io-index)", + "toml 0.3.2 (registry+/~https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "memchr" +version = "0.1.11" +source = "registry+/~https://github.com/rust-lang/crates.io-index" +dependencies = [ + "libc 0.2.22 (registry+/~https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -375,7 +699,7 @@ name = "memchr" version = "1.0.1" source = "registry+/~https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.21 (registry+/~https://github.com/rust-lang/crates.io-index)", + "libc 0.2.22 (registry+/~https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -384,7 +708,96 @@ version = "0.1.9" source = "registry+/~https://github.com/rust-lang/crates.io-index" dependencies = [ "gcc 0.3.46 (registry+/~https://github.com/rust-lang/crates.io-index)", - "libc 0.2.21 (registry+/~https://github.com/rust-lang/crates.io-index)", + "libc 0.2.22 (registry+/~https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "miow" +version = "0.2.1" +source = "registry+/~https://github.com/rust-lang/crates.io-index" +dependencies = [ + "kernel32-sys 0.2.2 (registry+/~https://github.com/rust-lang/crates.io-index)", + "net2 0.2.29 (registry+/~https://github.com/rust-lang/crates.io-index)", + "winapi 0.2.8 (registry+/~https://github.com/rust-lang/crates.io-index)", + "ws2_32-sys 0.2.1 (registry+/~https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "multimap" +version = "0.3.0" +source = "registry+/~https://github.com/rust-lang/crates.io-index" + +[[package]] +name = "net2" +version = "0.2.29" +source = "registry+/~https://github.com/rust-lang/crates.io-index" +dependencies = [ + "cfg-if 0.1.0 (registry+/~https://github.com/rust-lang/crates.io-index)", + "kernel32-sys 0.2.2 (registry+/~https://github.com/rust-lang/crates.io-index)", + "libc 0.2.22 (registry+/~https://github.com/rust-lang/crates.io-index)", + "winapi 0.2.8 (registry+/~https://github.com/rust-lang/crates.io-index)", + "ws2_32-sys 0.2.1 (registry+/~https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "num" +version = "0.1.37" +source = "registry+/~https://github.com/rust-lang/crates.io-index" +dependencies = [ + "num-bigint 0.1.37 (registry+/~https://github.com/rust-lang/crates.io-index)", + "num-complex 0.1.37 (registry+/~https://github.com/rust-lang/crates.io-index)", + "num-integer 0.1.34 (registry+/~https://github.com/rust-lang/crates.io-index)", + "num-iter 0.1.33 (registry+/~https://github.com/rust-lang/crates.io-index)", + "num-rational 0.1.36 (registry+/~https://github.com/rust-lang/crates.io-index)", + "num-traits 0.1.37 (registry+/~https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "num-bigint" +version = "0.1.37" +source = "registry+/~https://github.com/rust-lang/crates.io-index" +dependencies = [ + "num-integer 0.1.34 (registry+/~https://github.com/rust-lang/crates.io-index)", + "num-traits 0.1.37 (registry+/~https://github.com/rust-lang/crates.io-index)", + "rand 0.3.15 (registry+/~https://github.com/rust-lang/crates.io-index)", + "rustc-serialize 0.3.24 (registry+/~https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "num-complex" +version = "0.1.37" +source = "registry+/~https://github.com/rust-lang/crates.io-index" +dependencies = [ + "num-traits 0.1.37 (registry+/~https://github.com/rust-lang/crates.io-index)", + "rustc-serialize 0.3.24 (registry+/~https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "num-integer" +version = "0.1.34" +source = "registry+/~https://github.com/rust-lang/crates.io-index" +dependencies = [ + "num-traits 0.1.37 (registry+/~https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "num-iter" +version = "0.1.33" +source = "registry+/~https://github.com/rust-lang/crates.io-index" +dependencies = [ + "num-integer 0.1.34 (registry+/~https://github.com/rust-lang/crates.io-index)", + "num-traits 0.1.37 (registry+/~https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "num-rational" +version = "0.1.36" +source = "registry+/~https://github.com/rust-lang/crates.io-index" +dependencies = [ + "num-bigint 0.1.37 (registry+/~https://github.com/rust-lang/crates.io-index)", + "num-integer 0.1.34 (registry+/~https://github.com/rust-lang/crates.io-index)", + "num-traits 0.1.37 (registry+/~https://github.com/rust-lang/crates.io-index)", + "rustc-serialize 0.3.24 (registry+/~https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -397,7 +810,7 @@ name = "num_cpus" version = "1.4.0" source = "registry+/~https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.21 (registry+/~https://github.com/rust-lang/crates.io-index)", + "libc 0.2.22 (registry+/~https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -405,6 +818,35 @@ name = "open" version = "1.2.0" source = "registry+/~https://github.com/rust-lang/crates.io-index" +[[package]] +name = "openssl" +version = "0.9.12" +source = "registry+/~https://github.com/rust-lang/crates.io-index" +dependencies = [ + "bitflags 0.8.2 (registry+/~https://github.com/rust-lang/crates.io-index)", + "foreign-types 0.2.0 (registry+/~https://github.com/rust-lang/crates.io-index)", + "lazy_static 0.2.8 (registry+/~https://github.com/rust-lang/crates.io-index)", + "libc 0.2.22 (registry+/~https://github.com/rust-lang/crates.io-index)", + "openssl-sys 0.9.12 (registry+/~https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "openssl-probe" +version = "0.1.1" +source = "registry+/~https://github.com/rust-lang/crates.io-index" + +[[package]] +name = "openssl-sys" +version = "0.9.12" +source = "registry+/~https://github.com/rust-lang/crates.io-index" +dependencies = [ + "gcc 0.3.46 (registry+/~https://github.com/rust-lang/crates.io-index)", + "gdi32-sys 0.2.0 (registry+/~https://github.com/rust-lang/crates.io-index)", + "libc 0.2.22 (registry+/~https://github.com/rust-lang/crates.io-index)", + "pkg-config 0.3.9 (registry+/~https://github.com/rust-lang/crates.io-index)", + "user32-sys 0.2.0 (registry+/~https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "owning_ref" version = "0.3.3" @@ -436,6 +878,11 @@ name = "pest" version = "0.3.3" source = "registry+/~https://github.com/rust-lang/crates.io-index" +[[package]] +name = "pkg-config" +version = "0.3.9" +source = "registry+/~https://github.com/rust-lang/crates.io-index" + [[package]] name = "proc_macro" version = "0.0.0" @@ -452,6 +899,15 @@ dependencies = [ "syntax_pos 0.0.0", ] +[[package]] +name = "psapi-sys" +version = "0.1.0" +source = "registry+/~https://github.com/rust-lang/crates.io-index" +dependencies = [ + "winapi 0.2.8 (registry+/~https://github.com/rust-lang/crates.io-index)", + "winapi-build 0.1.1 (registry+/~https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "pulldown-cmark" version = "0.0.8" @@ -471,14 +927,63 @@ dependencies = [ [[package]] name = "quick-error" -version = "1.1.0" +version = "1.2.0" +source = "registry+/~https://github.com/rust-lang/crates.io-index" + +[[package]] +name = "quote" +version = "0.2.3" +source = "registry+/~https://github.com/rust-lang/crates.io-index" + +[[package]] +name = "quote" +version = "0.3.15" +source = "registry+/~https://github.com/rust-lang/crates.io-index" + +[[package]] +name = "racer" +version = "2.0.6" source = "registry+/~https://github.com/rust-lang/crates.io-index" +dependencies = [ + "clap 2.19.3 (registry+/~https://github.com/rust-lang/crates.io-index)", + "env_logger 0.3.5 (registry+/~https://github.com/rust-lang/crates.io-index)", + "log 0.3.7 (registry+/~https://github.com/rust-lang/crates.io-index)", + "syntex_errors 0.52.0 (registry+/~https://github.com/rust-lang/crates.io-index)", + "syntex_syntax 0.52.0 (registry+/~https://github.com/rust-lang/crates.io-index)", + "toml 0.2.1 (registry+/~https://github.com/rust-lang/crates.io-index)", + "typed-arena 1.2.0 (registry+/~https://github.com/rust-lang/crates.io-index)", +] [[package]] name = "rand" version = "0.0.0" dependencies = [ - "core 0.0.0", + "core 0.0.0", +] + +[[package]] +name = "rand" +version = "0.3.15" +source = "registry+/~https://github.com/rust-lang/crates.io-index" +dependencies = [ + "libc 0.2.22 (registry+/~https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "redox_syscall" +version = "0.1.17" +source = "registry+/~https://github.com/rust-lang/crates.io-index" + +[[package]] +name = "regex" +version = "0.1.80" +source = "registry+/~https://github.com/rust-lang/crates.io-index" +dependencies = [ + "aho-corasick 0.5.3 (registry+/~https://github.com/rust-lang/crates.io-index)", + "memchr 0.1.11 (registry+/~https://github.com/rust-lang/crates.io-index)", + "regex-syntax 0.3.9 (registry+/~https://github.com/rust-lang/crates.io-index)", + "thread_local 0.2.7 (registry+/~https://github.com/rust-lang/crates.io-index)", + "utf8-ranges 0.1.3 (registry+/~https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -493,6 +998,11 @@ dependencies = [ "utf8-ranges 1.0.0 (registry+/~https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "regex-syntax" +version = "0.3.9" +source = "registry+/~https://github.com/rust-lang/crates.io-index" + [[package]] name = "regex-syntax" version = "0.4.0" @@ -506,13 +1016,48 @@ version = "0.1.0" name = "remote-test-server" version = "0.1.0" +[[package]] +name = "rls" +version = "0.1.0" +dependencies = [ + "cargo 0.20.0 (git+/~https://github.com/rust-lang/cargo)", + "derive-new 0.3.0 (registry+/~https://github.com/rust-lang/crates.io-index)", + "env_logger 0.4.2 (registry+/~https://github.com/rust-lang/crates.io-index)", + "languageserver-types 0.10.0 (registry+/~https://github.com/rust-lang/crates.io-index)", + "log 0.3.7 (registry+/~https://github.com/rust-lang/crates.io-index)", + "racer 2.0.6 (registry+/~https://github.com/rust-lang/crates.io-index)", + "rls-analysis 0.2.1 (registry+/~https://github.com/rust-lang/crates.io-index)", + "rls-data 0.3.1 (registry+/~https://github.com/rust-lang/crates.io-index)", + "rls-span 0.4.0 (registry+/~https://github.com/rust-lang/crates.io-index)", + "rls-vfs 0.3.0 (registry+/~https://github.com/rust-lang/crates.io-index)", + "rustfmt 0.8.4 (git+/~https://github.com/rust-lang-nursery/rustfmt)", + "serde 1.0.6 (registry+/~https://github.com/rust-lang/crates.io-index)", + "serde_derive 1.0.6 (registry+/~https://github.com/rust-lang/crates.io-index)", + "serde_json 1.0.2 (registry+/~https://github.com/rust-lang/crates.io-index)", + "toml 0.4.1 (registry+/~https://github.com/rust-lang/crates.io-index)", + "url 1.4.0 (registry+/~https://github.com/rust-lang/crates.io-index)", + "url_serde 0.2.0 (registry+/~https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "rls-analysis" +version = "0.2.1" +source = "registry+/~https://github.com/rust-lang/crates.io-index" +dependencies = [ + "derive-new 0.3.0 (registry+/~https://github.com/rust-lang/crates.io-index)", + "log 0.3.7 (registry+/~https://github.com/rust-lang/crates.io-index)", + "rls-data 0.3.1 (registry+/~https://github.com/rust-lang/crates.io-index)", + "rls-span 0.4.0 (registry+/~https://github.com/rust-lang/crates.io-index)", + "rustc-serialize 0.3.24 (registry+/~https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "rls-data" version = "0.3.1" source = "registry+/~https://github.com/rust-lang/crates.io-index" dependencies = [ "rls-span 0.4.0 (registry+/~https://github.com/rust-lang/crates.io-index)", - "rustc-serialize 0.3.23 (registry+/~https://github.com/rust-lang/crates.io-index)", + "rustc-serialize 0.3.24 (registry+/~https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -520,14 +1065,25 @@ name = "rls-span" version = "0.4.0" source = "registry+/~https://github.com/rust-lang/crates.io-index" dependencies = [ - "rustc-serialize 0.3.23 (registry+/~https://github.com/rust-lang/crates.io-index)", + "rustc-serialize 0.3.24 (registry+/~https://github.com/rust-lang/crates.io-index)", + "serde 1.0.6 (registry+/~https://github.com/rust-lang/crates.io-index)", + "serde_derive 1.0.6 (registry+/~https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "rls-vfs" +version = "0.3.0" +source = "registry+/~https://github.com/rust-lang/crates.io-index" +dependencies = [ + "racer 2.0.6 (registry+/~https://github.com/rust-lang/crates.io-index)", + "rls-span 0.4.0 (registry+/~https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "rustbook" version = "0.1.0" dependencies = [ - "clap 2.22.1 (registry+/~https://github.com/rust-lang/crates.io-index)", + "clap 2.19.3 (registry+/~https://github.com/rust-lang/crates.io-index)", "mdbook 0.0.21 (registry+/~https://github.com/rust-lang/crates.io-index)", ] @@ -566,7 +1122,7 @@ dependencies = [ [[package]] name = "rustc-serialize" -version = "0.3.23" +version = "0.3.24" source = "registry+/~https://github.com/rust-lang/crates.io-index" [[package]] @@ -823,7 +1379,7 @@ dependencies = [ "rls-data 0.3.1 (registry+/~https://github.com/rust-lang/crates.io-index)", "rls-span 0.4.0 (registry+/~https://github.com/rust-lang/crates.io-index)", "rustc 0.0.0", - "rustc-serialize 0.3.23 (registry+/~https://github.com/rust-lang/crates.io-index)", + "rustc-serialize 0.3.24 (registry+/~https://github.com/rust-lang/crates.io-index)", "rustc_typeck 0.0.0", "syntax 0.0.0", "syntax_pos 0.0.0", @@ -902,6 +1458,33 @@ dependencies = [ "syntax_pos 0.0.0", ] +[[package]] +name = "rustfmt" +version = "0.8.4" +source = "git+/~https://github.com/rust-lang-nursery/rustfmt#bf9b3fa1d7cab2f7bd541539d397a92b4954ec96" +dependencies = [ + "diff 0.1.10 (registry+/~https://github.com/rust-lang/crates.io-index)", + "env_logger 0.4.2 (registry+/~https://github.com/rust-lang/crates.io-index)", + "getopts 0.2.14 (registry+/~https://github.com/rust-lang/crates.io-index)", + "itertools 0.5.10 (registry+/~https://github.com/rust-lang/crates.io-index)", + "kernel32-sys 0.2.2 (registry+/~https://github.com/rust-lang/crates.io-index)", + "libc 0.2.22 (registry+/~https://github.com/rust-lang/crates.io-index)", + "log 0.3.7 (registry+/~https://github.com/rust-lang/crates.io-index)", + "multimap 0.3.0 (registry+/~https://github.com/rust-lang/crates.io-index)", + "regex 0.2.1 (registry+/~https://github.com/rust-lang/crates.io-index)", + "serde 1.0.6 (registry+/~https://github.com/rust-lang/crates.io-index)", + "serde_derive 1.0.6 (registry+/~https://github.com/rust-lang/crates.io-index)", + "serde_json 1.0.2 (registry+/~https://github.com/rust-lang/crates.io-index)", + "strings 0.0.1 (registry+/~https://github.com/rust-lang/crates.io-index)", + "syntex_errors 0.58.1 (registry+/~https://github.com/rust-lang/crates.io-index)", + "syntex_syntax 0.58.1 (registry+/~https://github.com/rust-lang/crates.io-index)", + "term 0.4.5 (registry+/~https://github.com/rust-lang/crates.io-index)", + "toml 0.4.1 (registry+/~https://github.com/rust-lang/crates.io-index)", + "unicode-segmentation 1.2.0 (registry+/~https://github.com/rust-lang/crates.io-index)", + "walkdir 1.0.7 (registry+/~https://github.com/rust-lang/crates.io-index)", + "winapi 0.2.8 (registry+/~https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "same-file" version = "0.1.3" @@ -911,26 +1494,87 @@ dependencies = [ "winapi 0.2.8 (registry+/~https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "semver" +version = "0.6.0" +source = "registry+/~https://github.com/rust-lang/crates.io-index" +dependencies = [ + "semver-parser 0.7.0 (registry+/~https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "semver-parser" +version = "0.7.0" +source = "registry+/~https://github.com/rust-lang/crates.io-index" + +[[package]] +name = "serde" +version = "0.9.15" +source = "registry+/~https://github.com/rust-lang/crates.io-index" + [[package]] name = "serde" -version = "0.9.11" +version = "1.0.6" +source = "registry+/~https://github.com/rust-lang/crates.io-index" + +[[package]] +name = "serde_derive" +version = "1.0.6" +source = "registry+/~https://github.com/rust-lang/crates.io-index" +dependencies = [ + "quote 0.3.15 (registry+/~https://github.com/rust-lang/crates.io-index)", + "serde_derive_internals 0.15.0 (registry+/~https://github.com/rust-lang/crates.io-index)", + "syn 0.11.11 (registry+/~https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "serde_derive_internals" +version = "0.15.0" +source = "registry+/~https://github.com/rust-lang/crates.io-index" +dependencies = [ + "syn 0.11.11 (registry+/~https://github.com/rust-lang/crates.io-index)", + "synom 0.11.3 (registry+/~https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "serde_ignored" +version = "0.0.3" +source = "registry+/~https://github.com/rust-lang/crates.io-index" +dependencies = [ + "serde 1.0.6 (registry+/~https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "serde_json" +version = "0.9.10" source = "registry+/~https://github.com/rust-lang/crates.io-index" +dependencies = [ + "dtoa 0.4.1 (registry+/~https://github.com/rust-lang/crates.io-index)", + "itoa 0.3.1 (registry+/~https://github.com/rust-lang/crates.io-index)", + "num-traits 0.1.37 (registry+/~https://github.com/rust-lang/crates.io-index)", + "serde 0.9.15 (registry+/~https://github.com/rust-lang/crates.io-index)", +] [[package]] name = "serde_json" -version = "0.9.9" +version = "1.0.2" source = "registry+/~https://github.com/rust-lang/crates.io-index" dependencies = [ "dtoa 0.4.1 (registry+/~https://github.com/rust-lang/crates.io-index)", "itoa 0.3.1 (registry+/~https://github.com/rust-lang/crates.io-index)", "num-traits 0.1.37 (registry+/~https://github.com/rust-lang/crates.io-index)", - "serde 0.9.11 (registry+/~https://github.com/rust-lang/crates.io-index)", + "serde 1.0.6 (registry+/~https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "serialize" version = "0.0.0" +[[package]] +name = "shell-escape" +version = "0.1.3" +source = "registry+/~https://github.com/rust-lang/crates.io-index" + [[package]] name = "stable_deref_trait" version = "1.0.0" @@ -967,11 +1611,51 @@ dependencies = [ "core 0.0.0", ] +[[package]] +name = "strings" +version = "0.0.1" +source = "registry+/~https://github.com/rust-lang/crates.io-index" +dependencies = [ + "log 0.3.7 (registry+/~https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "strsim" +version = "0.5.2" +source = "registry+/~https://github.com/rust-lang/crates.io-index" + [[package]] name = "strsim" version = "0.6.0" source = "registry+/~https://github.com/rust-lang/crates.io-index" +[[package]] +name = "syn" +version = "0.8.7" +source = "registry+/~https://github.com/rust-lang/crates.io-index" +dependencies = [ + "quote 0.2.3 (registry+/~https://github.com/rust-lang/crates.io-index)", + "unicode-xid 0.0.3 (registry+/~https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "syn" +version = "0.11.11" +source = "registry+/~https://github.com/rust-lang/crates.io-index" +dependencies = [ + "quote 0.3.15 (registry+/~https://github.com/rust-lang/crates.io-index)", + "synom 0.11.3 (registry+/~https://github.com/rust-lang/crates.io-index)", + "unicode-xid 0.0.4 (registry+/~https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "synom" +version = "0.11.3" +source = "registry+/~https://github.com/rust-lang/crates.io-index" +dependencies = [ + "unicode-xid 0.0.4 (registry+/~https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "syntax" version = "0.0.0" @@ -1003,27 +1687,113 @@ dependencies = [ "serialize 0.0.0", ] +[[package]] +name = "syntex_errors" +version = "0.52.0" +source = "registry+/~https://github.com/rust-lang/crates.io-index" +dependencies = [ + "libc 0.2.22 (registry+/~https://github.com/rust-lang/crates.io-index)", + "log 0.3.7 (registry+/~https://github.com/rust-lang/crates.io-index)", + "rustc-serialize 0.3.24 (registry+/~https://github.com/rust-lang/crates.io-index)", + "syntex_pos 0.52.0 (registry+/~https://github.com/rust-lang/crates.io-index)", + "term 0.4.5 (registry+/~https://github.com/rust-lang/crates.io-index)", + "unicode-xid 0.0.3 (registry+/~https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "syntex_errors" +version = "0.58.1" +source = "registry+/~https://github.com/rust-lang/crates.io-index" +dependencies = [ + "libc 0.2.22 (registry+/~https://github.com/rust-lang/crates.io-index)", + "rustc-serialize 0.3.24 (registry+/~https://github.com/rust-lang/crates.io-index)", + "syntex_pos 0.58.1 (registry+/~https://github.com/rust-lang/crates.io-index)", + "term 0.4.5 (registry+/~https://github.com/rust-lang/crates.io-index)", + "unicode-xid 0.0.4 (registry+/~https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "syntex_pos" +version = "0.52.0" +source = "registry+/~https://github.com/rust-lang/crates.io-index" +dependencies = [ + "rustc-serialize 0.3.24 (registry+/~https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "syntex_pos" +version = "0.58.1" +source = "registry+/~https://github.com/rust-lang/crates.io-index" +dependencies = [ + "rustc-serialize 0.3.24 (registry+/~https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "syntex_syntax" +version = "0.52.0" +source = "registry+/~https://github.com/rust-lang/crates.io-index" +dependencies = [ + "bitflags 0.7.0 (registry+/~https://github.com/rust-lang/crates.io-index)", + "libc 0.2.22 (registry+/~https://github.com/rust-lang/crates.io-index)", + "log 0.3.7 (registry+/~https://github.com/rust-lang/crates.io-index)", + "rustc-serialize 0.3.24 (registry+/~https://github.com/rust-lang/crates.io-index)", + "syntex_errors 0.52.0 (registry+/~https://github.com/rust-lang/crates.io-index)", + "syntex_pos 0.52.0 (registry+/~https://github.com/rust-lang/crates.io-index)", + "term 0.4.5 (registry+/~https://github.com/rust-lang/crates.io-index)", + "unicode-xid 0.0.3 (registry+/~https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "syntex_syntax" +version = "0.58.1" +source = "registry+/~https://github.com/rust-lang/crates.io-index" +dependencies = [ + "bitflags 0.8.2 (registry+/~https://github.com/rust-lang/crates.io-index)", + "log 0.3.7 (registry+/~https://github.com/rust-lang/crates.io-index)", + "rustc-serialize 0.3.24 (registry+/~https://github.com/rust-lang/crates.io-index)", + "syntex_errors 0.58.1 (registry+/~https://github.com/rust-lang/crates.io-index)", + "syntex_pos 0.58.1 (registry+/~https://github.com/rust-lang/crates.io-index)", + "unicode-xid 0.0.4 (registry+/~https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "tar" version = "0.4.12" source = "registry+/~https://github.com/rust-lang/crates.io-index" dependencies = [ "filetime 0.1.10 (registry+/~https://github.com/rust-lang/crates.io-index)", - "libc 0.2.21 (registry+/~https://github.com/rust-lang/crates.io-index)", + "libc 0.2.22 (registry+/~https://github.com/rust-lang/crates.io-index)", "xattr 0.1.11 (registry+/~https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "tempdir" +version = "0.3.5" +source = "registry+/~https://github.com/rust-lang/crates.io-index" +dependencies = [ + "rand 0.3.15 (registry+/~https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "term" version = "0.0.0" +[[package]] +name = "term" +version = "0.4.5" +source = "registry+/~https://github.com/rust-lang/crates.io-index" +dependencies = [ + "kernel32-sys 0.2.2 (registry+/~https://github.com/rust-lang/crates.io-index)", + "winapi 0.2.8 (registry+/~https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "term_size" version = "0.2.3" source = "registry+/~https://github.com/rust-lang/crates.io-index" dependencies = [ "kernel32-sys 0.2.2 (registry+/~https://github.com/rust-lang/crates.io-index)", - "libc 0.2.21 (registry+/~https://github.com/rust-lang/crates.io-index)", + "libc 0.2.22 (registry+/~https://github.com/rust-lang/crates.io-index)", "winapi 0.2.8 (registry+/~https://github.com/rust-lang/crates.io-index)", ] @@ -1037,11 +1807,28 @@ dependencies = [ [[package]] name = "thread-id" -version = "3.0.0" +version = "2.0.0" +source = "registry+/~https://github.com/rust-lang/crates.io-index" +dependencies = [ + "kernel32-sys 0.2.2 (registry+/~https://github.com/rust-lang/crates.io-index)", + "libc 0.2.22 (registry+/~https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "thread-id" +version = "3.1.0" source = "registry+/~https://github.com/rust-lang/crates.io-index" dependencies = [ "kernel32-sys 0.2.2 (registry+/~https://github.com/rust-lang/crates.io-index)", - "libc 0.2.21 (registry+/~https://github.com/rust-lang/crates.io-index)", + "libc 0.2.22 (registry+/~https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "thread_local" +version = "0.2.7" +source = "registry+/~https://github.com/rust-lang/crates.io-index" +dependencies = [ + "thread-id 2.0.0 (registry+/~https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1049,7 +1836,7 @@ name = "thread_local" version = "0.3.3" source = "registry+/~https://github.com/rust-lang/crates.io-index" dependencies = [ - "thread-id 3.0.0 (registry+/~https://github.com/rust-lang/crates.io-index)", + "thread-id 3.1.0 (registry+/~https://github.com/rust-lang/crates.io-index)", "unreachable 0.1.1 (registry+/~https://github.com/rust-lang/crates.io-index)", ] @@ -1057,25 +1844,75 @@ dependencies = [ name = "tidy" version = "0.1.0" +[[package]] +name = "time" +version = "0.1.37" +source = "registry+/~https://github.com/rust-lang/crates.io-index" +dependencies = [ + "kernel32-sys 0.2.2 (registry+/~https://github.com/rust-lang/crates.io-index)", + "libc 0.2.22 (registry+/~https://github.com/rust-lang/crates.io-index)", + "redox_syscall 0.1.17 (registry+/~https://github.com/rust-lang/crates.io-index)", + "winapi 0.2.8 (registry+/~https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "toml" version = "0.1.30" source = "registry+/~https://github.com/rust-lang/crates.io-index" dependencies = [ - "rustc-serialize 0.3.23 (registry+/~https://github.com/rust-lang/crates.io-index)", + "rustc-serialize 0.3.24 (registry+/~https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "toml" -version = "0.3.1" +version = "0.2.1" +source = "registry+/~https://github.com/rust-lang/crates.io-index" +dependencies = [ + "rustc-serialize 0.3.24 (registry+/~https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "toml" +version = "0.3.2" +source = "registry+/~https://github.com/rust-lang/crates.io-index" +dependencies = [ + "serde 0.9.15 (registry+/~https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "toml" +version = "0.4.1" +source = "registry+/~https://github.com/rust-lang/crates.io-index" +dependencies = [ + "serde 1.0.6 (registry+/~https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "typed-arena" +version = "1.2.0" +source = "registry+/~https://github.com/rust-lang/crates.io-index" + +[[package]] +name = "unicode-bidi" +version = "0.2.5" source = "registry+/~https://github.com/rust-lang/crates.io-index" dependencies = [ - "serde 0.9.11 (registry+/~https://github.com/rust-lang/crates.io-index)", + "matches 0.1.4 (registry+/~https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "unicode-normalization" +version = "0.1.4" +source = "registry+/~https://github.com/rust-lang/crates.io-index" + [[package]] name = "unicode-segmentation" -version = "1.1.0" +version = "0.1.3" +source = "registry+/~https://github.com/rust-lang/crates.io-index" + +[[package]] +name = "unicode-segmentation" +version = "1.2.0" source = "registry+/~https://github.com/rust-lang/crates.io-index" [[package]] @@ -1083,6 +1920,16 @@ name = "unicode-width" version = "0.1.4" source = "registry+/~https://github.com/rust-lang/crates.io-index" +[[package]] +name = "unicode-xid" +version = "0.0.3" +source = "registry+/~https://github.com/rust-lang/crates.io-index" + +[[package]] +name = "unicode-xid" +version = "0.0.4" +source = "registry+/~https://github.com/rust-lang/crates.io-index" + [[package]] name = "unreachable" version = "0.1.1" @@ -1091,6 +1938,38 @@ dependencies = [ "void 1.0.2 (registry+/~https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "url" +version = "1.4.0" +source = "registry+/~https://github.com/rust-lang/crates.io-index" +dependencies = [ + "idna 0.1.1 (registry+/~https://github.com/rust-lang/crates.io-index)", + "matches 0.1.4 (registry+/~https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "url_serde" +version = "0.2.0" +source = "registry+/~https://github.com/rust-lang/crates.io-index" +dependencies = [ + "serde 1.0.6 (registry+/~https://github.com/rust-lang/crates.io-index)", + "url 1.4.0 (registry+/~https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "user32-sys" +version = "0.2.0" +source = "registry+/~https://github.com/rust-lang/crates.io-index" +dependencies = [ + "winapi 0.2.8 (registry+/~https://github.com/rust-lang/crates.io-index)", + "winapi-build 0.1.1 (registry+/~https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "utf8-ranges" +version = "0.1.3" +source = "registry+/~https://github.com/rust-lang/crates.io-index" + [[package]] name = "utf8-ranges" version = "1.0.0" @@ -1098,7 +1977,7 @@ source = "registry+/~https://github.com/rust-lang/crates.io-index" [[package]] name = "vec_map" -version = "0.7.0" +version = "0.6.0" source = "registry+/~https://github.com/rust-lang/crates.io-index" [[package]] @@ -1126,12 +2005,21 @@ name = "winapi-build" version = "0.1.1" source = "registry+/~https://github.com/rust-lang/crates.io-index" +[[package]] +name = "ws2_32-sys" +version = "0.2.1" +source = "registry+/~https://github.com/rust-lang/crates.io-index" +dependencies = [ + "winapi 0.2.8 (registry+/~https://github.com/rust-lang/crates.io-index)", + "winapi-build 0.1.1 (registry+/~https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "xattr" version = "0.1.11" source = "registry+/~https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.21 (registry+/~https://github.com/rust-lang/crates.io-index)", + "libc 0.2.22 (registry+/~https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1148,69 +2036,158 @@ version = "0.3.5" source = "registry+/~https://github.com/rust-lang/crates.io-index" [metadata] +"checksum advapi32-sys 0.2.0 (registry+/~https://github.com/rust-lang/crates.io-index)" = "e06588080cb19d0acb6739808aafa5f26bfb2ca015b2b6370028b44cf7cb8a9a" +"checksum aho-corasick 0.5.3 (registry+/~https://github.com/rust-lang/crates.io-index)" = "ca972c2ea5f742bfce5687b9aef75506a764f61d37f8f649047846a9686ddb66" "checksum aho-corasick 0.6.3 (registry+/~https://github.com/rust-lang/crates.io-index)" = "500909c4f87a9e52355b26626d890833e9e1d53ac566db76c36faa984b889699" "checksum ansi_term 0.9.0 (registry+/~https://github.com/rust-lang/crates.io-index)" = "23ac7c30002a5accbf7e8987d0632fa6de155b7c3d39d0067317a391e00a2ef6" -"checksum atty 0.2.2 (registry+/~https://github.com/rust-lang/crates.io-index)" = "d912da0db7fa85514874458ca3651fe2cddace8d0b0505571dbdcd41ab490159" "checksum backtrace 0.3.0 (registry+/~https://github.com/rust-lang/crates.io-index)" = "f551bc2ddd53aea015d453ef0b635af89444afa5ed2405dd0b2062ad5d600d80" "checksum backtrace-sys 0.1.10 (registry+/~https://github.com/rust-lang/crates.io-index)" = "d192fd129132fbc97497c1f2ec2c2c5174e376b95f535199ef4fe0a293d33842" "checksum bitflags 0.5.0 (registry+/~https://github.com/rust-lang/crates.io-index)" = "4f67931368edf3a9a51d29886d245f1c3db2f1ef0dcc9e35ff70341b78c10d23" +"checksum bitflags 0.7.0 (registry+/~https://github.com/rust-lang/crates.io-index)" = "aad18937a628ec6abcd26d1489012cc0e18c21798210f491af69ded9b881106d" "checksum bitflags 0.8.2 (registry+/~https://github.com/rust-lang/crates.io-index)" = "1370e9fc2a6ae53aea8b7a5110edbd08836ed87c88736dfabccade1c2b44bff4" +"checksum bufstream 0.1.3 (registry+/~https://github.com/rust-lang/crates.io-index)" = "f2f382711e76b9de6c744cc00d0497baba02fb00a787f088c879f01d09468e32" +"checksum cargo 0.20.0 (git+/~https://github.com/rust-lang/cargo)" = "" "checksum cfg-if 0.1.0 (registry+/~https://github.com/rust-lang/crates.io-index)" = "de1e760d7b6535af4241fca8bd8adf68e2e7edacc6b29f5d399050c5e48cf88c" -"checksum clap 2.22.1 (registry+/~https://github.com/rust-lang/crates.io-index)" = "e17a4a72ffea176f77d6e2db609c6c919ef221f23862c9915e687fb54d833485" +"checksum chrono 0.3.1 (registry+/~https://github.com/rust-lang/crates.io-index)" = "d9123be86fd2a8f627836c235ecdf331fdd067ecf7ac05aa1a68fbcf2429f056" +"checksum clap 2.19.3 (registry+/~https://github.com/rust-lang/crates.io-index)" = "95b78f3fe0fc94c13c731714363260e04b557a637166f33a4570d3189d642374" "checksum cmake 0.1.23 (registry+/~https://github.com/rust-lang/crates.io-index)" = "92278eb79412c8f75cfc89e707a1bb3a6490b68f7f2e78d15c774f30fe701122" +"checksum crossbeam 0.2.10 (registry+/~https://github.com/rust-lang/crates.io-index)" = "0c5ea215664ca264da8a9d9c3be80d2eaf30923c259d03e870388eb927508f97" +"checksum curl 0.4.6 (registry+/~https://github.com/rust-lang/crates.io-index)" = "c90e1240ef340dd4027ade439e5c7c2064dd9dc652682117bd50d1486a3add7b" +"checksum curl-sys 0.3.11 (registry+/~https://github.com/rust-lang/crates.io-index)" = "23e7e544dc5e1ba42c4a4a678bd47985e84b9c3f4d3404c29700622a029db9c3" "checksum dbghelp-sys 0.2.0 (registry+/~https://github.com/rust-lang/crates.io-index)" = "97590ba53bcb8ac28279161ca943a924d1fd4a8fb3fa63302591647c4fc5b850" +"checksum derive-new 0.3.0 (registry+/~https://github.com/rust-lang/crates.io-index)" = "41be6ca3b99e0c0483fb2389685448f650459c3ecbe4e18d7705d8010ec4ab8e" "checksum diff 0.1.10 (registry+/~https://github.com/rust-lang/crates.io-index)" = "0a515461b6c8c08419850ced27bc29e86166dcdcde8fbe76f8b1f0589bb49472" +"checksum docopt 0.7.0 (registry+/~https://github.com/rust-lang/crates.io-index)" = "ab32ea6e284d87987066f21a9e809a73c14720571ef34516f0890b3d355ccfd8" "checksum dtoa 0.4.1 (registry+/~https://github.com/rust-lang/crates.io-index)" = "80c8b71fd71146990a9742fc06dcbbde19161a267e0ad4e572c35162f4578c90" +"checksum either 1.1.0 (registry+/~https://github.com/rust-lang/crates.io-index)" = "18785c1ba806c258137c937e44ada9ee7e69a37e3c72077542cd2f069d78562a" +"checksum enum_primitive 0.1.1 (registry+/~https://github.com/rust-lang/crates.io-index)" = "be4551092f4d519593039259a9ed8daedf0da12e5109c5280338073eaeb81180" +"checksum env_logger 0.3.5 (registry+/~https://github.com/rust-lang/crates.io-index)" = "15abd780e45b3ea4f76b4e9a26ff4843258dd8a3eed2775a0e7368c2e7936c2f" "checksum env_logger 0.4.2 (registry+/~https://github.com/rust-lang/crates.io-index)" = "e3856f1697098606fc6cb97a93de88ca3f3bc35bb878c725920e6e82ecf05e83" "checksum error-chain 0.10.0 (registry+/~https://github.com/rust-lang/crates.io-index)" = "d9435d864e017c3c6afeac1654189b06cdb491cf2ff73dbf0d73b0f292f42ff8" "checksum filetime 0.1.10 (registry+/~https://github.com/rust-lang/crates.io-index)" = "5363ab8e4139b8568a6237db5248646e5a8a2f89bd5ccb02092182b11fd3e922" "checksum flate2 0.2.19 (registry+/~https://github.com/rust-lang/crates.io-index)" = "36df0166e856739905cd3d7e0b210fe818592211a008862599845e012d8d304c" +"checksum foreign-types 0.2.0 (registry+/~https://github.com/rust-lang/crates.io-index)" = "3e4056b9bd47f8ac5ba12be771f77a0dae796d1bbaaf5fd0b9c2d38b69b8a29d" +"checksum fs2 0.4.1 (registry+/~https://github.com/rust-lang/crates.io-index)" = "34edaee07555859dc13ca387e6ae05686bb4d0364c95d649b6dab959511f4baf" "checksum gcc 0.3.46 (registry+/~https://github.com/rust-lang/crates.io-index)" = "181e3cebba1d663bd92eb90e2da787e10597e027eb00de8d742b260a7850948f" +"checksum gdi32-sys 0.2.0 (registry+/~https://github.com/rust-lang/crates.io-index)" = "0912515a8ff24ba900422ecda800b52f4016a56251922d397c576bf92c690518" "checksum getopts 0.2.14 (registry+/~https://github.com/rust-lang/crates.io-index)" = "d9047cfbd08a437050b363d35ef160452c5fe8ea5187ae0a624708c91581d685" -"checksum handlebars 0.25.2 (registry+/~https://github.com/rust-lang/crates.io-index)" = "663e1728d8037fb0d4e13bcd1b1909fb5d913690a9929eb385922df157c2ff8f" +"checksum git2 0.6.5 (registry+/~https://github.com/rust-lang/crates.io-index)" = "9de9df4358c17e448a778d90cd0272e1dab5eae30244502333fa2001c4e24357" +"checksum git2-curl 0.7.0 (registry+/~https://github.com/rust-lang/crates.io-index)" = "68676bc784bf0bef83278898929bf64a251e87c0340723d0b93fa096c9c5bf8e" +"checksum glob 0.2.11 (registry+/~https://github.com/rust-lang/crates.io-index)" = "8be18de09a56b60ed0edf84bc9df007e30040691af7acd1c41874faac5895bfb" +"checksum hamcrest 0.1.1 (registry+/~https://github.com/rust-lang/crates.io-index)" = "bf088f042a467089e9baa4972f57f9247e42a0cc549ba264c7a04fbb8ecb89d4" +"checksum handlebars 0.25.3 (registry+/~https://github.com/rust-lang/crates.io-index)" = "15bdf598fc3c2de40c6b340213028301c0d225eea55a2294e6cc148074e557a1" +"checksum idna 0.1.1 (registry+/~https://github.com/rust-lang/crates.io-index)" = "6ac85ec3f80c8e4e99d9325521337e14ec7555c458a14e377d189659a427f375" +"checksum itertools 0.5.10 (registry+/~https://github.com/rust-lang/crates.io-index)" = "4833d6978da405305126af4ac88569b5d71ff758581ce5a987dbfa3755f694fc" "checksum itoa 0.3.1 (registry+/~https://github.com/rust-lang/crates.io-index)" = "eb2f404fbc66fd9aac13e998248505e7ecb2ad8e44ab6388684c5fb11c6c251c" "checksum kernel32-sys 0.2.2 (registry+/~https://github.com/rust-lang/crates.io-index)" = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d" +"checksum languageserver-types 0.10.0 (registry+/~https://github.com/rust-lang/crates.io-index)" = "97c2985bfcbbcb0189cfa25e1c10c1ac7111df2b6214b652c690127aefdf4e5b" "checksum lazy_static 0.2.8 (registry+/~https://github.com/rust-lang/crates.io-index)" = "3b37545ab726dd833ec6420aaba8231c5b320814b9029ad585555d2a03e94fbf" -"checksum libc 0.2.21 (registry+/~https://github.com/rust-lang/crates.io-index)" = "88ee81885f9f04bff991e306fea7c1c60a5f0f9e409e99f6b40e3311a3363135" +"checksum libc 0.2.22 (registry+/~https://github.com/rust-lang/crates.io-index)" = "babb8281da88cba992fa1f4ddec7d63ed96280a1a53ec9b919fd37b53d71e502" +"checksum libgit2-sys 0.6.10 (registry+/~https://github.com/rust-lang/crates.io-index)" = "dd89dd7196d5fa35b659c3eaf3c1b14b9bd961bfd1a07dfca49adeb8a6aa3763" +"checksum libssh2-sys 0.2.6 (registry+/~https://github.com/rust-lang/crates.io-index)" = "0db4ec23611747ef772db1c4d650f8bd762f07b461727ec998f953c614024b75" +"checksum libz-sys 1.0.13 (registry+/~https://github.com/rust-lang/crates.io-index)" = "e5ee912a45d686d393d5ac87fac15ba0ba18daae14e8e7543c63ebf7fb7e970c" "checksum log 0.3.7 (registry+/~https://github.com/rust-lang/crates.io-index)" = "5141eca02775a762cc6cd564d8d2c50f67c0ea3a372cbf1c51592b3e029e10ad" "checksum lzma-sys 0.1.4 (registry+/~https://github.com/rust-lang/crates.io-index)" = "fedff6a5cbb24494ec6ee4784e9ac5c187161fede04c7767d49bf87544013afa" +"checksum matches 0.1.4 (registry+/~https://github.com/rust-lang/crates.io-index)" = "efd7622e3022e1a6eaa602c4cea8912254e5582c9c692e9167714182244801b1" "checksum mdbook 0.0.21 (registry+/~https://github.com/rust-lang/crates.io-index)" = "f1e2e9d848514dcfad4195788d0d42ae5153a477c191d75d5b84fab10f222fbd" +"checksum memchr 0.1.11 (registry+/~https://github.com/rust-lang/crates.io-index)" = "d8b629fb514376c675b98c1421e80b151d3817ac42d7c667717d282761418d20" "checksum memchr 1.0.1 (registry+/~https://github.com/rust-lang/crates.io-index)" = "1dbccc0e46f1ea47b9f17e6d67c5a96bd27030519c519c9c91327e31275a47b4" "checksum miniz-sys 0.1.9 (registry+/~https://github.com/rust-lang/crates.io-index)" = "28eaee17666671fa872e567547e8428e83308ebe5808cdf6a0e28397dbe2c726" +"checksum miow 0.2.1 (registry+/~https://github.com/rust-lang/crates.io-index)" = "8c1f2f3b1cf331de6896aabf6e9d55dca90356cc9960cca7eaaf408a355ae919" +"checksum multimap 0.3.0 (registry+/~https://github.com/rust-lang/crates.io-index)" = "9223f4774d08e06185e44e555b9a7561243d387bac49c78a6205c42d6975fbf2" +"checksum net2 0.2.29 (registry+/~https://github.com/rust-lang/crates.io-index)" = "bc01404e7568680f1259aa5729539f221cb1e6d047a0d9053cab4be8a73b5d67" +"checksum num 0.1.37 (registry+/~https://github.com/rust-lang/crates.io-index)" = "98b15ba84e910ea7a1973bccd3df7b31ae282bf9d8bd2897779950c9b8303d40" +"checksum num-bigint 0.1.37 (registry+/~https://github.com/rust-lang/crates.io-index)" = "ba6d838b16e56da1b6c383d065ff1ec3c7d7797f65a3e8f6ba7092fd87820bac" +"checksum num-complex 0.1.37 (registry+/~https://github.com/rust-lang/crates.io-index)" = "148eb324ca772230853418731ffdf13531738b50f89b30692a01fcdcb0a64677" +"checksum num-integer 0.1.34 (registry+/~https://github.com/rust-lang/crates.io-index)" = "ef1a4bf6f9174aa5783a9b4cc892cacd11aebad6c69ad027a0b65c6ca5f8aa37" +"checksum num-iter 0.1.33 (registry+/~https://github.com/rust-lang/crates.io-index)" = "f7d1891bd7b936f12349b7d1403761c8a0b85a18b148e9da4429d5d102c1a41e" +"checksum num-rational 0.1.36 (registry+/~https://github.com/rust-lang/crates.io-index)" = "c2dc5ea04020a8f18318ae485c751f8cfa1c0e69dcf465c29ddaaa64a313cc44" "checksum num-traits 0.1.37 (registry+/~https://github.com/rust-lang/crates.io-index)" = "e1cbfa3781f3fe73dc05321bed52a06d2d491eaa764c52335cf4399f046ece99" "checksum num_cpus 1.4.0 (registry+/~https://github.com/rust-lang/crates.io-index)" = "ca313f1862c7ec3e0dfe8ace9fa91b1d9cb5c84ace3d00f5ec4216238e93c167" "checksum open 1.2.0 (registry+/~https://github.com/rust-lang/crates.io-index)" = "3478ed1686bd1300c8a981a940abc92b06fac9cbef747f4c668d4e032ff7b842" +"checksum openssl 0.9.12 (registry+/~https://github.com/rust-lang/crates.io-index)" = "bb5d1663b73d10c6a3eda53e2e9d0346f822394e7b858d7257718f65f61dfbe2" +"checksum openssl-probe 0.1.1 (registry+/~https://github.com/rust-lang/crates.io-index)" = "d98df0270d404ccd3c050a41d579c52d1db15375168bb3471e04ec0f5f378daf" +"checksum openssl-sys 0.9.12 (registry+/~https://github.com/rust-lang/crates.io-index)" = "3a5886d87d3e2a0d890bf62dc8944f5e3769a405f7e1e9ef6e517e47fd7a0897" "checksum owning_ref 0.3.3 (registry+/~https://github.com/rust-lang/crates.io-index)" = "cdf84f41639e037b484f93433aa3897863b561ed65c6e59c7073d7c561710f37" "checksum pest 0.3.3 (registry+/~https://github.com/rust-lang/crates.io-index)" = "0a6dda33d67c26f0aac90d324ab2eb7239c819fc7b2552fe9faa4fe88441edc8" +"checksum pkg-config 0.3.9 (registry+/~https://github.com/rust-lang/crates.io-index)" = "3a8b4c6b8165cd1a1cd4b9b120978131389f64bdaf456435caa41e630edba903" +"checksum psapi-sys 0.1.0 (registry+/~https://github.com/rust-lang/crates.io-index)" = "abcd5d1a07d360e29727f757a9decb3ce8bc6e0efa8969cfaad669a8317a2478" "checksum pulldown-cmark 0.0.14 (registry+/~https://github.com/rust-lang/crates.io-index)" = "d9ab1e588ef8efd702c7ed9d2bd774db5e6f4d878bb5a1a9f371828fbdff6973" "checksum pulldown-cmark 0.0.8 (registry+/~https://github.com/rust-lang/crates.io-index)" = "1058d7bb927ca067656537eec4e02c2b4b70eaaa129664c5b90c111e20326f41" -"checksum quick-error 1.1.0 (registry+/~https://github.com/rust-lang/crates.io-index)" = "0aad603e8d7fb67da22dbdf1f4b826ce8829e406124109e73cf1b2454b93a71c" +"checksum quick-error 1.2.0 (registry+/~https://github.com/rust-lang/crates.io-index)" = "3c36987d4978eb1be2e422b1e0423a557923a5c3e7e6f31d5699e9aafaefa469" +"checksum quote 0.2.3 (registry+/~https://github.com/rust-lang/crates.io-index)" = "4c5cf478fe1006dbcc72567121d23dbdae5f1632386068c5c86ff4f645628504" +"checksum quote 0.3.15 (registry+/~https://github.com/rust-lang/crates.io-index)" = "7a6e920b65c65f10b2ae65c831a81a073a89edd28c7cce89475bff467ab4167a" +"checksum racer 2.0.6 (registry+/~https://github.com/rust-lang/crates.io-index)" = "b0d72b3afd67882adfca61d609fafb8d7aa5f9e814f12c32fcc6e171995920e8" +"checksum rand 0.3.15 (registry+/~https://github.com/rust-lang/crates.io-index)" = "022e0636ec2519ddae48154b028864bdce4eaf7d35226ab8e65c611be97b189d" +"checksum redox_syscall 0.1.17 (registry+/~https://github.com/rust-lang/crates.io-index)" = "29dbdfd4b9df8ab31dec47c6087b7b13cbf4a776f335e4de8efba8288dda075b" +"checksum regex 0.1.80 (registry+/~https://github.com/rust-lang/crates.io-index)" = "4fd4ace6a8cf7860714a2c2280d6c1f7e6a413486c13298bbc86fd3da019402f" "checksum regex 0.2.1 (registry+/~https://github.com/rust-lang/crates.io-index)" = "4278c17d0f6d62dfef0ab00028feb45bd7d2102843f80763474eeb1be8a10c01" +"checksum regex-syntax 0.3.9 (registry+/~https://github.com/rust-lang/crates.io-index)" = "f9ec002c35e86791825ed294b50008eea9ddfc8def4420124fbc6b08db834957" "checksum regex-syntax 0.4.0 (registry+/~https://github.com/rust-lang/crates.io-index)" = "2f9191b1f57603095f105d317e375d19b1c9c5c3185ea9633a99a6dcbed04457" +"checksum rls-analysis 0.2.1 (registry+/~https://github.com/rust-lang/crates.io-index)" = "a62d88c341375c6f3f8b2e18b9b364896e7d3e7aa916907de717d0267e116506" "checksum rls-data 0.3.1 (registry+/~https://github.com/rust-lang/crates.io-index)" = "fc4277ce3c57f456b11fe3145b181a844a25201bab5cbaa1978457e6e2f27d47" "checksum rls-span 0.4.0 (registry+/~https://github.com/rust-lang/crates.io-index)" = "5d7c7046dc6a92f2ae02ed302746db4382e75131b9ce20ce967259f6b5867a6a" +"checksum rls-vfs 0.3.0 (registry+/~https://github.com/rust-lang/crates.io-index)" = "986eada111517bcb5a7a75205b3f2b70c82e7766653cca61a23f5afce79bdb94" "checksum rustc-demangle 0.1.4 (registry+/~https://github.com/rust-lang/crates.io-index)" = "3058a43ada2c2d0b92b3ae38007a2d0fa5e9db971be260e0171408a4ff471c95" -"checksum rustc-serialize 0.3.23 (registry+/~https://github.com/rust-lang/crates.io-index)" = "684ce48436d6465300c9ea783b6b14c4361d6b8dcbb1375b486a69cc19e2dfb0" +"checksum rustc-serialize 0.3.24 (registry+/~https://github.com/rust-lang/crates.io-index)" = "dcf128d1287d2ea9d80910b5f1120d0b8eede3fbf1abe91c40d39ea7d51e6fda" +"checksum rustfmt 0.8.4 (git+/~https://github.com/rust-lang-nursery/rustfmt)" = "" "checksum same-file 0.1.3 (registry+/~https://github.com/rust-lang/crates.io-index)" = "d931a44fdaa43b8637009e7632a02adc4f2b2e0733c08caa4cf00e8da4a117a7" -"checksum serde 0.9.11 (registry+/~https://github.com/rust-lang/crates.io-index)" = "a702319c807c016e51f672e5c77d6f0b46afddd744b5e437d6b8436b888b458f" -"checksum serde_json 0.9.9 (registry+/~https://github.com/rust-lang/crates.io-index)" = "dbc45439552eb8fb86907a2c41c1fd0ef97458efb87ff7f878db466eb581824e" +"checksum semver 0.6.0 (registry+/~https://github.com/rust-lang/crates.io-index)" = "7a3186ec9e65071a2095434b1f5bb24838d4e8e130f584c790f6033c79943537" +"checksum semver-parser 0.7.0 (registry+/~https://github.com/rust-lang/crates.io-index)" = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" +"checksum serde 0.9.15 (registry+/~https://github.com/rust-lang/crates.io-index)" = "34b623917345a631dc9608d5194cc206b3fe6c3554cd1c75b937e55e285254af" +"checksum serde 1.0.6 (registry+/~https://github.com/rust-lang/crates.io-index)" = "38a3db3a5757f68069aba764b793823ea9fb9717c42c016f8903f8add50f508a" +"checksum serde_derive 1.0.6 (registry+/~https://github.com/rust-lang/crates.io-index)" = "e46ef71ee001a4279a4513e79a6ebbb59da3a4987bf77a6df2e5534cd6f21d82" +"checksum serde_derive_internals 0.15.0 (registry+/~https://github.com/rust-lang/crates.io-index)" = "021c338d22c7e30f957a6ab7e388cb6098499dda9fd4ba1661ee074ca7a180d1" +"checksum serde_ignored 0.0.3 (registry+/~https://github.com/rust-lang/crates.io-index)" = "c10e798e4405d7dcec3658989e35ee6706f730a9ed7c1184d5ebd84317e82f46" +"checksum serde_json 0.9.10 (registry+/~https://github.com/rust-lang/crates.io-index)" = "ad8bcf487be7d2e15d3d543f04312de991d631cfe1b43ea0ade69e6a8a5b16a1" +"checksum serde_json 1.0.2 (registry+/~https://github.com/rust-lang/crates.io-index)" = "48b04779552e92037212c3615370f6bd57a40ebba7f20e554ff9f55e41a69a7b" +"checksum shell-escape 0.1.3 (registry+/~https://github.com/rust-lang/crates.io-index)" = "dd5cc96481d54583947bfe88bf30c23d53f883c6cd0145368b69989d97b84ef8" "checksum stable_deref_trait 1.0.0 (registry+/~https://github.com/rust-lang/crates.io-index)" = "15132e0e364248108c5e2c02e3ab539be8d6f5d52a01ca9bbf27ed657316f02b" +"checksum strings 0.0.1 (registry+/~https://github.com/rust-lang/crates.io-index)" = "54f86446ab480b4f60782188f4f78886465c5793aee248cbb48b7fdc0d022420" +"checksum strsim 0.5.2 (registry+/~https://github.com/rust-lang/crates.io-index)" = "67f84c44fbb2f91db7fef94554e6b2ac05909c9c0b0bc23bb98d3a1aebfe7f7c" "checksum strsim 0.6.0 (registry+/~https://github.com/rust-lang/crates.io-index)" = "b4d15c810519a91cf877e7e36e63fe068815c678181439f2f29e2562147c3694" +"checksum syn 0.11.11 (registry+/~https://github.com/rust-lang/crates.io-index)" = "d3b891b9015c88c576343b9b3e41c2c11a51c219ef067b264bd9c8aa9b441dad" +"checksum syn 0.8.7 (registry+/~https://github.com/rust-lang/crates.io-index)" = "6ae6fb0dcc9bd85f89a1a4adc0df2fd90c90c98849d61433983dd7a9df6363f7" +"checksum synom 0.11.3 (registry+/~https://github.com/rust-lang/crates.io-index)" = "a393066ed9010ebaed60b9eafa373d4b1baac186dd7e008555b0f702b51945b6" +"checksum syntex_errors 0.52.0 (registry+/~https://github.com/rust-lang/crates.io-index)" = "9e52bffe6202cfb67587784cf23e0ec5bf26d331eef4922a16d5c42e12aa1e9b" +"checksum syntex_errors 0.58.1 (registry+/~https://github.com/rust-lang/crates.io-index)" = "867cc5c2d7140ae7eaad2ae9e8bf39cb18a67ca651b7834f88d46ca98faadb9c" +"checksum syntex_pos 0.52.0 (registry+/~https://github.com/rust-lang/crates.io-index)" = "955ef4b16af4c468e4680d1497f873ff288f557d338180649e18f915af5e15ac" +"checksum syntex_pos 0.58.1 (registry+/~https://github.com/rust-lang/crates.io-index)" = "13ad4762fe52abc9f4008e85c4fb1b1fe3aa91ccb99ff4826a439c7c598e1047" +"checksum syntex_syntax 0.52.0 (registry+/~https://github.com/rust-lang/crates.io-index)" = "76a302e717e348aa372ff577791c3832395650073b8d8432f8b3cb170b34afde" +"checksum syntex_syntax 0.58.1 (registry+/~https://github.com/rust-lang/crates.io-index)" = "6e0e4dbae163dd98989464c23dd503161b338790640e11537686f2ef0f25c791" "checksum tar 0.4.12 (registry+/~https://github.com/rust-lang/crates.io-index)" = "ab0ef9ead2fe0aa9e18475a96a207bfd5143f4124779ef7429503a8665416ce8" +"checksum tempdir 0.3.5 (registry+/~https://github.com/rust-lang/crates.io-index)" = "87974a6f5c1dfb344d733055601650059a3363de2a6104819293baff662132d6" +"checksum term 0.4.5 (registry+/~https://github.com/rust-lang/crates.io-index)" = "d168af3930b369cfe245132550579d47dfd873d69470755a19c2c6568dbbd989" "checksum term_size 0.2.3 (registry+/~https://github.com/rust-lang/crates.io-index)" = "07b6c1ac5b3fffd75073276bca1ceed01f67a28537097a2a9539e116e50fb21a" -"checksum thread-id 3.0.0 (registry+/~https://github.com/rust-lang/crates.io-index)" = "4437c97558c70d129e40629a5b385b3fb1ffac301e63941335e4d354081ec14a" +"checksum thread-id 2.0.0 (registry+/~https://github.com/rust-lang/crates.io-index)" = "a9539db560102d1cef46b8b78ce737ff0bb64e7e18d35b2a5688f7d097d0ff03" +"checksum thread-id 3.1.0 (registry+/~https://github.com/rust-lang/crates.io-index)" = "8df7875b676fddfadffd96deea3b1124e5ede707d4884248931077518cf1f773" +"checksum thread_local 0.2.7 (registry+/~https://github.com/rust-lang/crates.io-index)" = "8576dbbfcaef9641452d5cf0df9b0e7eeab7694956dd33bb61515fb8f18cfdd5" "checksum thread_local 0.3.3 (registry+/~https://github.com/rust-lang/crates.io-index)" = "c85048c6260d17cf486ceae3282d9fb6b90be220bf5b28c400f5485ffc29f0c7" +"checksum time 0.1.37 (registry+/~https://github.com/rust-lang/crates.io-index)" = "ffd7ccbf969a892bf83f1e441126968a07a3941c24ff522a26af9f9f4585d1a3" "checksum toml 0.1.30 (registry+/~https://github.com/rust-lang/crates.io-index)" = "0590d72182e50e879c4da3b11c6488dae18fccb1ae0c7a3eda18e16795844796" -"checksum toml 0.3.1 (registry+/~https://github.com/rust-lang/crates.io-index)" = "3474f3c6eaf32eedb4f4a66a26214f020f828a6d96c37e38a35e3a379bbcfd11" -"checksum unicode-segmentation 1.1.0 (registry+/~https://github.com/rust-lang/crates.io-index)" = "18127285758f0e2c6cf325bb3f3d138a12fee27de4f23e146cd6a179f26c2cf3" +"checksum toml 0.2.1 (registry+/~https://github.com/rust-lang/crates.io-index)" = "736b60249cb25337bc196faa43ee12c705e426f3d55c214d73a4e7be06f92cb4" +"checksum toml 0.3.2 (registry+/~https://github.com/rust-lang/crates.io-index)" = "bd86ad9ebee246fdedd610e0f6d0587b754a3d81438db930a244d0480ed7878f" +"checksum toml 0.4.1 (registry+/~https://github.com/rust-lang/crates.io-index)" = "4cc5dbfb20a481e64b99eb7ae280859ec76730c7191570ba5edaa962394edb0a" +"checksum typed-arena 1.2.0 (registry+/~https://github.com/rust-lang/crates.io-index)" = "8e2f9dc90da4f9d66ffc9ad3ead2c7d57582a26f4a3292d2ce7011bd29965100" +"checksum unicode-bidi 0.2.5 (registry+/~https://github.com/rust-lang/crates.io-index)" = "d3a078ebdd62c0e71a709c3d53d2af693fe09fe93fbff8344aebe289b78f9032" +"checksum unicode-normalization 0.1.4 (registry+/~https://github.com/rust-lang/crates.io-index)" = "e28fa37426fceeb5cf8f41ee273faa7c82c47dc8fba5853402841e665fcd86ff" +"checksum unicode-segmentation 0.1.3 (registry+/~https://github.com/rust-lang/crates.io-index)" = "c3bc443ded17b11305ffffe6b37e2076f328a5a8cb6aa877b1b98f77699e98b5" +"checksum unicode-segmentation 1.2.0 (registry+/~https://github.com/rust-lang/crates.io-index)" = "a8083c594e02b8ae1654ae26f0ade5158b119bd88ad0e8227a5d8fcd72407946" "checksum unicode-width 0.1.4 (registry+/~https://github.com/rust-lang/crates.io-index)" = "bf3a113775714a22dcb774d8ea3655c53a32debae63a063acc00a91cc586245f" +"checksum unicode-xid 0.0.3 (registry+/~https://github.com/rust-lang/crates.io-index)" = "36dff09cafb4ec7c8cf0023eb0b686cb6ce65499116a12201c9e11840ca01beb" +"checksum unicode-xid 0.0.4 (registry+/~https://github.com/rust-lang/crates.io-index)" = "8c1f860d7d29cf02cb2f3f359fd35991af3d30bac52c57d265a3c461074cb4dc" "checksum unreachable 0.1.1 (registry+/~https://github.com/rust-lang/crates.io-index)" = "1f2ae5ddb18e1c92664717616dd9549dde73f539f01bd7b77c2edb2446bdff91" +"checksum url 1.4.0 (registry+/~https://github.com/rust-lang/crates.io-index)" = "f5ba8a749fb4479b043733416c244fa9d1d3af3d7c23804944651c8a448cb87e" +"checksum url_serde 0.2.0 (registry+/~https://github.com/rust-lang/crates.io-index)" = "74e7d099f1ee52f823d4bdd60c93c3602043c728f5db3b97bdb548467f7bddea" +"checksum user32-sys 0.2.0 (registry+/~https://github.com/rust-lang/crates.io-index)" = "4ef4711d107b21b410a3a974b1204d9accc8b10dad75d8324b5d755de1617d47" +"checksum utf8-ranges 0.1.3 (registry+/~https://github.com/rust-lang/crates.io-index)" = "a1ca13c08c41c9c3e04224ed9ff80461d97e121589ff27c753a16cb10830ae0f" "checksum utf8-ranges 1.0.0 (registry+/~https://github.com/rust-lang/crates.io-index)" = "662fab6525a98beff2921d7f61a39e7d59e0b425ebc7d0d9e66d316e55124122" -"checksum vec_map 0.7.0 (registry+/~https://github.com/rust-lang/crates.io-index)" = "f8cdc8b93bd0198ed872357fb2e667f7125646b1762f16d60b2c96350d361897" +"checksum vec_map 0.6.0 (registry+/~https://github.com/rust-lang/crates.io-index)" = "cac5efe5cb0fa14ec2f84f83c701c562ee63f6dcc680861b21d65c682adfb05f" "checksum void 1.0.2 (registry+/~https://github.com/rust-lang/crates.io-index)" = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" "checksum walkdir 1.0.7 (registry+/~https://github.com/rust-lang/crates.io-index)" = "bb08f9e670fab86099470b97cd2b252d6527f0b3cc1401acdb595ffc9dd288ff" "checksum winapi 0.2.8 (registry+/~https://github.com/rust-lang/crates.io-index)" = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a" "checksum winapi-build 0.1.1 (registry+/~https://github.com/rust-lang/crates.io-index)" = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc" +"checksum ws2_32-sys 0.2.1 (registry+/~https://github.com/rust-lang/crates.io-index)" = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e" "checksum xattr 0.1.11 (registry+/~https://github.com/rust-lang/crates.io-index)" = "5f04de8a1346489a2f9e9bd8526b73d135ec554227b17568456e86aa35b6f3fc" "checksum xz2 0.1.3 (registry+/~https://github.com/rust-lang/crates.io-index)" = "e9510bdf100731599107c61f77daf46713a69a568f75458999c1f9dbf6ba25b0" "checksum yaml-rust 0.3.5 (registry+/~https://github.com/rust-lang/crates.io-index)" = "e66366e18dc58b46801afbf2ca7661a9f59cc8c5962c29892b6039b4f86fa992" diff --git a/src/Cargo.toml b/src/Cargo.toml index 99e8b9f256afc..85a6df3573ae1 100644 --- a/src/Cargo.toml +++ b/src/Cargo.toml @@ -14,10 +14,6 @@ members = [ "tools/remote-test-client", "tools/remote-test-server", "tools/rust-installer", -] - -# These projects have their own Cargo.lock -exclude = [ "tools/cargo", "tools/rls", ] @@ -38,3 +34,6 @@ debug-assertions = false [profile.test] debug = false debug-assertions = false + +[replace] +"/~https://github.com/rust-lang/cargo#0.20.0" = { path = "tools/cargo" } diff --git a/src/bootstrap/bin/rustc.rs b/src/bootstrap/bin/rustc.rs index 906c468241ae9..eb2cef133a34f 100644 --- a/src/bootstrap/bin/rustc.rs +++ b/src/bootstrap/bin/rustc.rs @@ -38,7 +38,24 @@ use std::path::PathBuf; use std::process::{Command, ExitStatus}; fn main() { - let args = env::args_os().skip(1).collect::>(); + let mut args = env::args_os().skip(1).collect::>(); + + // Append metadata suffix for internal crates. See the corresponding entry + // in bootstrap/lib.rs for details. + if let Ok(s) = env::var("RUSTC_METADATA_SUFFIX") { + for i in 1..args.len() { + // Dirty code for borrowing issues + let mut new = None; + if let Some(current_as_str) = args[i].to_str() { + if (&*args[i - 1] == "-C" && current_as_str.starts_with("metadata")) || + current_as_str.starts_with("-Cmetadata") { + new = Some(format!("{}-{}", current_as_str, s)); + } + } + if let Some(new) = new { args[i] = new.into(); } + } + } + // Detect whether or not we're a build script depending on whether --target // is passed (a bit janky...) let target = args.windows(2) diff --git a/src/bootstrap/bootstrap.py b/src/bootstrap/bootstrap.py index ad3cf31c1b921..e15304a7e6e67 100644 --- a/src/bootstrap/bootstrap.py +++ b/src/bootstrap/bootstrap.py @@ -14,6 +14,7 @@ import datetime import hashlib import os +import re import shutil import subprocess import sys @@ -126,13 +127,13 @@ def unpack(tarball, dst, verbose=False, match=None): shutil.move(tp, fp) shutil.rmtree(os.path.join(dst, fname)) -def run(args, verbose=False, exception=False): +def run(args, verbose=False, exception=False, cwd=None): if verbose: print("running: " + ' '.join(args)) sys.stdout.flush() # Use Popen here instead of call() as it apparently allows powershell on # Windows to not lock up waiting for input presumably. - ret = subprocess.Popen(args) + ret = subprocess.Popen(args, cwd=cwd) code = ret.wait() if code != 0: err = "failed to run: " + ' '.join(args) @@ -297,8 +298,10 @@ def bin_root(self): def get_toml(self, key): for line in self.config_toml.splitlines(): - if line.startswith(key + ' ='): - return self.get_string(line) + match = re.match(r'^{}\s*=(.*)$'.format(key), line) + if match is not None: + value = match.group(1) + return self.get_string(value) or value.strip() return None def get_mk(self, key): @@ -329,6 +332,8 @@ def rustc(self): def get_string(self, line): start = line.find('"') + if start == -1: + return None end = start + 1 + line[start + 1:].find('"') return line[start + 1:end] @@ -386,12 +391,21 @@ def build_bootstrap(self): args.append("--frozen") self.run(args, env) - def run(self, args, env): - proc = subprocess.Popen(args, env=env) + def run(self, args, env=None, cwd=None): + proc = subprocess.Popen(args, env=env, cwd=cwd) ret = proc.wait() if ret != 0: sys.exit(ret) + def output(self, args, env=None, cwd=None): + proc = subprocess.Popen(args, stdout=subprocess.PIPE, env=env, cwd=cwd) + (out, err) = proc.communicate() + ret = proc.wait() + if ret != 0: + print(out) + sys.exit(ret) + return out + def build_triple(self): default_encoding = sys.getdefaultencoding() config = self.get_toml('build') @@ -529,6 +543,54 @@ def build_triple(self): return "{}-{}".format(cputype, ostype) + def update_submodules(self): + if (not os.path.exists(os.path.join(self.rust_root, ".git"))) or \ + self.get_toml('submodules') == "false" or \ + self.get_mk('CFG_DISABLE_MANAGE_SUBMODULES') == "1": + return + + print('Updating submodules') + output = self.output(["git", "submodule", "status"], cwd=self.rust_root) + submodules = [] + for line in output.splitlines(): + # NOTE `git submodule status` output looks like this: + # + # -5066b7dcab7e700844b0e2ba71b8af9dc627a59b src/liblibc + # +b37ef24aa82d2be3a3cc0fe89bf82292f4ca181c src/compiler-rt (remotes/origin/..) + # e058ca661692a8d01f8cf9d35939dfe3105ce968 src/jemalloc (3.6.0-533-ge058ca6) + # + # The first character can be '-', '+' or ' ' and denotes the + # `State` of the submodule Right next to this character is the + # SHA-1 of the submodule HEAD And after that comes the path to the + # submodule + path = line[1:].split(' ')[1] + submodules.append([path, line[0]]) + + self.run(["git", "submodule", "sync"], cwd=self.rust_root) + + for submod in submodules: + path, status = submod + if path.endswith(b"llvm") and \ + (self.get_toml('llvm-config') or self.get_mk('CFG_LLVM_ROOT')): + continue + if path.endswith(b"jemalloc") and \ + (self.get_toml('jemalloc') or self.get_mk('CFG_JEMALLOC_ROOT')): + continue + submod_path = os.path.join(self.rust_root, path) + + if status == ' ': + self.run(["git", "reset", "--hard"], cwd=submod_path) + self.run(["git", "clean", "-fdx"], cwd=submod_path) + elif status == '+': + self.run(["git", "submodule", "update", path], cwd=self.rust_root) + self.run(["git", "reset", "--hard"], cwd=submod_path) + self.run(["git", "clean", "-fdx"], cwd=submod_path) + elif status == '-': + self.run(["git", "submodule", "init", path], cwd=self.rust_root) + self.run(["git", "submodule", "update", path], cwd=self.rust_root) + else: + raise ValueError('unknown submodule status: ' + status) + def bootstrap(): parser = argparse.ArgumentParser(description='Build rust') parser.add_argument('--config') @@ -597,6 +659,8 @@ def bootstrap(): else: rb._download_url = 'https://static.rust-lang.org' + rb.update_submodules() + # Fetch/build the bootstrap rb.build = rb.build_triple() rb.download_stage0() diff --git a/src/bootstrap/lib.rs b/src/bootstrap/lib.rs index ea0b521a2ce69..ca9de43f54219 100644 --- a/src/bootstrap/lib.rs +++ b/src/bootstrap/lib.rs @@ -82,7 +82,7 @@ use std::env; use std::ffi::OsString; use std::fs::{self, File}; use std::io::Read; -use std::path::{Component, PathBuf, Path}; +use std::path::{PathBuf, Path}; use std::process::Command; use build_helper::{run_silent, run_suppressed, output, mtime}; @@ -285,129 +285,12 @@ impl Build { self.verbose(&format!("auto-detected local-rebuild {}", local_release)); self.local_rebuild = true; } - self.verbose("updating submodules"); - self.update_submodules(); self.verbose("learning about cargo"); metadata::build(self); step::run(self); } - /// Updates all git submodules that we have. - /// - /// This will detect if any submodules are out of date an run the necessary - /// commands to sync them all with upstream. - fn update_submodules(&self) { - struct Submodule<'a> { - path: &'a Path, - state: State, - } - - enum State { - // The submodule may have staged/unstaged changes - MaybeDirty, - // Or could be initialized but never updated - NotInitialized, - // The submodule, itself, has extra commits but those changes haven't been commited to - // the (outer) git repository - OutOfSync, - } - - if !self.src_is_git || !self.config.submodules { - return - } - let git = || { - let mut cmd = Command::new("git"); - cmd.current_dir(&self.src); - return cmd - }; - let git_submodule = || { - let mut cmd = Command::new("git"); - cmd.current_dir(&self.src).arg("submodule"); - return cmd - }; - - // FIXME: this takes a seriously long time to execute on Windows and a - // nontrivial amount of time on Unix, we should have a better way - // of detecting whether we need to run all the submodule commands - // below. - let out = output(git_submodule().arg("status")); - let mut submodules = vec![]; - for line in out.lines() { - // NOTE `git submodule status` output looks like this: - // - // -5066b7dcab7e700844b0e2ba71b8af9dc627a59b src/liblibc - // +b37ef24aa82d2be3a3cc0fe89bf82292f4ca181c src/compiler-rt (remotes/origin/..) - // e058ca661692a8d01f8cf9d35939dfe3105ce968 src/jemalloc (3.6.0-533-ge058ca6) - // - // The first character can be '-', '+' or ' ' and denotes the `State` of the submodule - // Right next to this character is the SHA-1 of the submodule HEAD - // And after that comes the path to the submodule - let path = Path::new(line[1..].split(' ').skip(1).next().unwrap()); - let state = if line.starts_with('-') { - State::NotInitialized - } else if line.starts_with('+') { - State::OutOfSync - } else if line.starts_with(' ') { - State::MaybeDirty - } else { - panic!("unexpected git submodule state: {:?}", line.chars().next()); - }; - - submodules.push(Submodule { path: path, state: state }) - } - - self.run(git_submodule().arg("sync")); - - for submodule in submodules { - // If using llvm-root then don't touch the llvm submodule. - if submodule.path.components().any(|c| c == Component::Normal("llvm".as_ref())) && - self.config.target_config.get(&self.config.build) - .and_then(|c| c.llvm_config.as_ref()).is_some() - { - continue - } - - if submodule.path.components().any(|c| c == Component::Normal("jemalloc".as_ref())) && - !self.config.use_jemalloc - { - continue - } - - // `submodule.path` is the relative path to a submodule (from the repository root) - // `submodule_path` is the path to a submodule from the cwd - - // use `submodule.path` when e.g. executing a submodule specific command from the - // repository root - // use `submodule_path` when e.g. executing a normal git command for the submodule - // (set via `current_dir`) - let submodule_path = self.src.join(submodule.path); - - match submodule.state { - State::MaybeDirty => { - // drop staged changes - self.run(git().current_dir(&submodule_path) - .args(&["reset", "--hard"])); - // drops unstaged changes - self.run(git().current_dir(&submodule_path) - .args(&["clean", "-fdx"])); - }, - State::NotInitialized => { - self.run(git_submodule().arg("init").arg(submodule.path)); - self.run(git_submodule().arg("update").arg(submodule.path)); - }, - State::OutOfSync => { - // drops submodule commits that weren't reported to the (outer) git repository - self.run(git_submodule().arg("update").arg(submodule.path)); - self.run(git().current_dir(&submodule_path) - .args(&["reset", "--hard"])); - self.run(git().current_dir(&submodule_path) - .args(&["clean", "-fdx"])); - }, - } - } - } - /// Clear out `dir` if `input` is newer. /// /// After this executes, it will also ensure that `dir` exists. @@ -475,12 +358,30 @@ impl Build { .env("RUSTDOC_REAL", self.rustdoc(compiler)) .env("RUSTC_FLAGS", self.rustc_flags(target).join(" ")); - // Tools don't get debuginfo right now, e.g. cargo and rls don't get - // compiled with debuginfo. if mode != Mode::Tool { - cargo.env("RUSTC_DEBUGINFO", self.config.rust_debuginfo.to_string()) - .env("RUSTC_DEBUGINFO_LINES", self.config.rust_debuginfo_lines.to_string()) - .env("RUSTC_FORCE_UNSTABLE", "1"); + // Tools don't get debuginfo right now, e.g. cargo and rls don't + // get compiled with debuginfo. + cargo.env("RUSTC_DEBUGINFO", self.config.rust_debuginfo.to_string()) + .env("RUSTC_DEBUGINFO_LINES", self.config.rust_debuginfo_lines.to_string()) + .env("RUSTC_FORCE_UNSTABLE", "1"); + + // Currently the compiler depends on crates from crates.io, and + // then other crates can depend on the compiler (e.g. proc-macro + // crates). Let's say, for example that rustc itself depends on the + // bitflags crate. If an external crate then depends on the + // bitflags crate as well, we need to make sure they don't + // conflict, even if they pick the same verison of bitflags. We'll + // want to make sure that e.g. a plugin and rustc each get their + // own copy of bitflags. + + // Cargo ensures that this works in general through the -C metadata + // flag. This flag will frob the symbols in the binary to make sure + // they're different, even though the source code is the exact + // same. To solve this problem for the compiler we extend Cargo's + // already-passed -C metadata flag with our own. Our rustc.rs + // wrapper around the actual rustc will detect -C metadata being + // passed and frob it with this extra string we're passing in. + cargo.env("RUSTC_METADATA_SUFFIX", "rustc"); } // Enable usage of unstable features diff --git a/src/tools/rust-installer b/src/tools/rust-installer index 6a2c5d1291017..daa2a05ebe7b8 160000 --- a/src/tools/rust-installer +++ b/src/tools/rust-installer @@ -1 +1 @@ -Subproject commit 6a2c5d129101762d204185b888d62a244011c422 +Subproject commit daa2a05ebe7b8d07a309e8891ebc548652362954 diff --git a/src/tools/tidy/src/deps.rs b/src/tools/tidy/src/deps.rs index 8b7da2267cded..ba02ee0c6d73b 100644 --- a/src/tools/tidy/src/deps.rs +++ b/src/tools/tidy/src/deps.rs @@ -32,6 +32,7 @@ static EXCEPTIONS: &'static [&'static str] = &[ "openssl", // BSD+advertising clause, cargo, mdbook "pest", // MPL2, mdbook via handlebars "thread-id", // Apache-2.0, mdbook + "strings", // this is actually MIT/Apache-2.0 but it's not in the manifest yet ]; pub fn check(path: &Path, bad: &mut bool) {