Merge pull request #767 from alexcrichton/update-cargo

Update to latest Cargo master

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"

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,