Merge pull request #1771 from pietroalbini/pa-fix-cargo

Fix RLS not building with the latest cargo
rust-lang · Apr 4, 2022 · 74ccc9e · 74ccc9e
2 parents f3c253e + 28e4a7e
commit 74ccc9e
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 15 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -31,8 +31,8 @@ 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 = "d6cdde584a1f15ea086bae922e20fd27f7165431" }
-cargo-util = { git = "https://github.com/rust-lang/cargo", rev = "d6cdde584a1f15ea086bae922e20fd27f7165431" }
+cargo = { git = "https://github.com/rust-lang/cargo", rev = "1ef1e0a12723ce9548d7da2b63119de9002bead8" }
+cargo-util = { git = "https://github.com/rust-lang/cargo", rev = "1ef1e0a12723ce9548d7da2b63119de9002bead8" }
 cargo_metadata = "0.14"
 clippy_lints = { git = "https://github.com/rust-lang/rust-clippy", version = "0.1.60", optional = true }
 env_logger = "0.9"

diff --git a/rls/src/build/cargo.rs b/rls/src/build/cargo.rs
@@ -227,6 +227,7 @@ fn run_cargo_ws(
         build_config: BuildConfig::new(
             &config,
             opts.jobs,
+            false, // --keep-going
             opts.target.iter().map(|x| x.into()).collect::<Vec<String>>().as_slice(),
             CompileMode::Check { test: cfg_test },
         )?,