From c0f07b37a6bac72b18af2f828d9deec492393bdd Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Thu, 15 Mar 2018 14:25:07 -0700 Subject: [PATCH] Update to latest Cargo master --- Cargo.lock | 34 ++++++++-------------------------- Cargo.toml | 3 +-- src/build/cargo.rs | 14 +++++++------- 3 files changed, 16 insertions(+), 35 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index ad0f3516c66..9d2e3e73843 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -93,15 +93,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "cargo" version = "0.27.0" -source = "git+https://github.com/rust-lang/cargo?rev=5f83bb4044f32b60d06717c609610f67411fc671#5f83bb4044f32b60d06717c609610f67411fc671" +source = "git+https://github.com/rust-lang/cargo?rev=1184854427a938bd981f037f19364ad8713fe13b#1184854427a938bd981f037f19364ad8713fe13b" dependencies = [ "atty 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", + "clap 2.31.1 (registry+https://github.com/rust-lang/crates.io-index)", "core-foundation 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", - "crates-io 0.16.0 (git+https://github.com/rust-lang/cargo?rev=5f83bb4044f32b60d06717c609610f67411fc671)", + "crates-io 0.16.0 (git+https://github.com/rust-lang/cargo?rev=1184854427a938bd981f037f19364ad8713fe13b)", "crossbeam 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "crypto-hash 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "curl 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)", - "docopt 0.8.3 (registry+https://github.com/rust-lang/crates.io-index)", "env_logger 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)", "failure 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "filetime 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)", @@ -120,6 +120,7 @@ dependencies = [ "libgit2-sys 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", "miow 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "num-traits 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "num_cpus 1.8.0 (registry+https://github.com/rust-lang/crates.io-index)", "same-file 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", "scoped-tls 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -237,7 +238,7 @@ dependencies = [ [[package]] name = "crates-io" version = "0.16.0" -source = "git+https://github.com/rust-lang/cargo?rev=5f83bb4044f32b60d06717c609610f67411fc671#5f83bb4044f32b60d06717c609610f67411fc671" +source = "git+https://github.com/rust-lang/cargo?rev=1184854427a938bd981f037f19364ad8713fe13b#1184854427a938bd981f037f19364ad8713fe13b" dependencies = [ "curl 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)", "failure 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -338,18 +339,6 @@ name = "diff" version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -[[package]] -name = "docopt" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "lazy_static 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "regex 0.2.9 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.33 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 1.0.33 (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.2" @@ -1031,7 +1020,7 @@ dependencies = [ name = "rls" version = "0.126.0" dependencies = [ - "cargo 0.27.0 (git+https://github.com/rust-lang/cargo?rev=5f83bb4044f32b60d06717c609610f67411fc671)", + "cargo 0.27.0 (git+https://github.com/rust-lang/cargo?rev=1184854427a938bd981f037f19364ad8713fe13b)", "cargo_metadata 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", "clippy_lints 0.0.188 (registry+https://github.com/rust-lang/crates.io-index)", "env_logger 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1330,11 +1319,6 @@ name = "stable_deref_trait" version = "1.0.0" 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 = "strsim" version = "0.7.0" @@ -1681,7 +1665,7 @@ dependencies = [ "checksum bitflags 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4efd02e230a02e18f92fc2735f44597385ed02ad8f831e7c1c1156ee5e1ab3a5" "checksum bitflags 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b3c30d3802dfb7281680d6285f2ccdaa8c2d8fee41f93805dba5c4cf50dc23cf" "checksum byteorder 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "652805b7e73fada9d85e9a6682a4abd490cb52d96aeecc12e33a0de34dfd0d23" -"checksum cargo 0.27.0 (git+https://github.com/rust-lang/cargo?rev=5f83bb4044f32b60d06717c609610f67411fc671)" = "" +"checksum cargo 0.27.0 (git+https://github.com/rust-lang/cargo?rev=1184854427a938bd981f037f19364ad8713fe13b)" = "" "checksum cargo_metadata 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "b5caae26de3704081ef638f87f05a6891b04f2b7d5ce9429a3de21095528ae22" "checksum cc 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)" = "87f38f122db5615319a985757e526c00161d924d19b71a0f3e80c52bab1adcf6" "checksum cfg-if 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "d4c819a1287eb618df47cc647173c5c4c66ba19d888a6e50d605672aed3140de" @@ -1692,7 +1676,7 @@ dependencies = [ "checksum commoncrypto-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1fed34f46747aa73dfaa578069fd8279d2818ade2b55f38f22a9401c7f4083e2" "checksum core-foundation 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "286e0b41c3a20da26536c6000a280585d519fd07b3956b43aed8a79e9edce980" "checksum core-foundation-sys 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "716c271e8613ace48344f723b60b900a93150271e5be206212d052bbc0883efa" -"checksum crates-io 0.16.0 (git+https://github.com/rust-lang/cargo?rev=5f83bb4044f32b60d06717c609610f67411fc671)" = "" +"checksum crates-io 0.16.0 (git+https://github.com/rust-lang/cargo?rev=1184854427a938bd981f037f19364ad8713fe13b)" = "" "checksum crossbeam 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "24ce9782d4d5c53674646a6a4c1863a21a8fc0cb649b3c94dfc16e45071dea19" "checksum crossbeam-deque 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f739f8c5363aca78cfb059edf753d8f0d36908c348f3d8d1503f03d8b75d9cf3" "checksum crossbeam-epoch 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "59796cc6cbbdc6bb319161349db0c3250ec73ec7fcb763a51065ec4e2e158552" @@ -1702,7 +1686,6 @@ dependencies = [ "checksum curl-sys 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f46e49c7125131f5afaded06944d6888b55cbdf8eba05dae73c954019b907961" "checksum derive-new 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "92f8b8e1d6c8a5f5ea0849a0e4c55941576115c62d3fc425e96918bbbeb3d3c2" "checksum diff 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)" = "3c2b69f912779fbb121ceb775d74d51e915af17aaebc38d28a592843a2dd0a3a" -"checksum docopt 0.8.3 (registry+https://github.com/rust-lang/crates.io-index)" = "d8acd393692c503b168471874953a2531df0e9ab77d0b6bbc582395743300a4a" "checksum dtoa 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "09c3753c3db574d215cba4ea76018483895d7bff25a31b49ba45db21c48e50ab" "checksum either 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "740178ddf48b1a9e878e6d6509a1442a2d42fd2928aae8e7a6f8a36fb01981b3" "checksum ena 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f8b449f3b18c89d2dbe40548d2ee4fa58ea0a08b761992da6ecb9788e4688834" @@ -1817,7 +1800,6 @@ dependencies = [ "checksum smallvec 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "44db0ecb22921ef790d17ae13a3f6d15784183ff5f2a01aa32098c7498d2b4b9" "checksum socket2 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "71ebbe82fcdd697244ba7fe6e05e63b5c45910c3927e28469a04947494ff48d8" "checksum stable_deref_trait 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "15132e0e364248108c5e2c02e3ab539be8d6f5d52a01ca9bbf27ed657316f02b" -"checksum strsim 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b4d15c810519a91cf877e7e36e63fe068815c678181439f2f29e2562147c3694" "checksum strsim 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bb4f380125926a99e52bc279241539c018323fab05ad6368b56f93d9369ff550" "checksum syn 0.11.11 (registry+https://github.com/rust-lang/crates.io-index)" = "d3b891b9015c88c576343b9b3e41c2c11a51c219ef067b264bd9c8aa9b441dad" "checksum syn 0.12.14 (registry+https://github.com/rust-lang/crates.io-index)" = "8c5bc2d6ff27891209efa5f63e9de78648d7801f085e4653701a692ce938d6fd" diff --git a/Cargo.toml b/Cargo.toml index 6718ed5e6c8..eb9521f4268 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -10,8 +10,7 @@ categories = ["development-tools"] build = "build.rs" [dependencies] -# cargo hash delivered with nightly-2018-03-14 -cargo = { git = "https://github.com/rust-lang/cargo", rev = "5f83bb4044f32b60d06717c609610f67411fc671" } +cargo = { git = "https://github.com/rust-lang/cargo", rev = "1184854427a938bd981f037f19364ad8713fe13b" } cargo_metadata = "0.5.2" env_logger = "0.5" failure = "0.1.1" diff --git a/src/build/cargo.rs b/src/build/cargo.rs index 15861df88f2..05bb135d779 100644 --- a/src/build/cargo.rs +++ b/src/build/cargo.rs @@ -185,25 +185,25 @@ fn run_cargo( (opts, rustflags, rls_config.clear_env_rust_log) }; - let spec = Packages::from_flags(false, &[], &packages)?; + let spec = Packages::from_flags(false, Vec::new(), packages)?; let compile_opts = CompileOptions { - target: opts.target.as_ref().map(|t| &t[..]), + target: opts.target, spec, filter: CompileFilter::new( opts.lib, - &opts.bin, + opts.bin, opts.bins, // TODO: Support more crate target types - &[], + Vec::new(), false, - &[], + Vec::new(), false, - &[], + Vec::new(), false, opts.all_targets, ), - features: &opts.features, + features: opts.features, all_features: opts.all_features, no_default_features: opts.no_default_features, jobs: opts.jobs,