Merge pull request #1686 from ehuss/update-cargo

Update cargo
rust-lang · Jun 30, 2020 · dd341d5 · dd341d5
2 parents fb46b91 + 2fa1c51
commit dd341d5
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 24 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -30,7 +30,7 @@ rls-vfs = "0.8"
 rls-ipc = { version = "0.1.0", path = "rls-ipc", optional = true }
 
 anyhow = "1.0.26"
-cargo = { git = "https://github.com/rust-lang/cargo", rev = "258c89644c4587273a3ed3ee9522d2640facba43" }
+cargo = { git = "https://github.com/rust-lang/cargo", rev = "305eaf0dc5f5a38d6e8041319c2da95b71cf6a4a" }
 cargo_metadata = "0.8"
 clippy_lints = { git = "https://github.com/rust-lang/rust-clippy", rev = "7ea7cd165ad6705603852771bf82cc2fd6560db5", optional = true }
 env_logger = "0.7"

diff --git a/rls/src/build/cargo.rs b/rls/src/build/cargo.rs
@@ -384,13 +384,14 @@ impl Executor for RlsExecutor {
 
     fn exec(
         &self,
-        mut cargo_cmd: ProcessBuilder,
+        cargo_cmd: &ProcessBuilder,
         id: PackageId,
         target: &Target,
         mode: CompileMode,
         _on_stdout_line: &mut dyn FnMut(&str) -> CargoResult<()>,
         _on_stderr_line: &mut dyn FnMut(&str) -> CargoResult<()>,
     ) -> CargoResult<()> {
+        let mut cargo_cmd = cargo_cmd.clone();
         // Enforce JSON output so that we can parse the rustc output by
         // stripping --error-format if it was specified (e.g. Cargo pipelined
         // build)