Skip to content
This repository was archived by the owner on Dec 29, 2022. It is now read-only.

Commit 74ccc9e

Browse files
authored
Merge pull request #1771 from pietroalbini/pa-fix-cargo
Fix RLS not building with the latest cargo
2 parents f3c253e + 28e4a7e commit 74ccc9e

File tree

3 files changed

+15
-15
lines changed

3 files changed

+15
-15
lines changed

Cargo.lock

Lines changed: 12 additions & 13 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ rls-vfs = "0.8"
3131
rls-ipc = { version = "0.1.0", path = "rls-ipc", optional = true }
3232

3333
anyhow = "1.0.26"
34-
cargo = { git = "https://github.com/rust-lang/cargo", rev = "d6cdde584a1f15ea086bae922e20fd27f7165431" }
35-
cargo-util = { git = "https://github.com/rust-lang/cargo", rev = "d6cdde584a1f15ea086bae922e20fd27f7165431" }
34+
cargo = { git = "https://github.com/rust-lang/cargo", rev = "1ef1e0a12723ce9548d7da2b63119de9002bead8" }
35+
cargo-util = { git = "https://github.com/rust-lang/cargo", rev = "1ef1e0a12723ce9548d7da2b63119de9002bead8" }
3636
cargo_metadata = "0.14"
3737
clippy_lints = { git = "https://github.com/rust-lang/rust-clippy", version = "0.1.60", optional = true }
3838
env_logger = "0.9"

rls/src/build/cargo.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -227,6 +227,7 @@ fn run_cargo_ws(
227227
build_config: BuildConfig::new(
228228
&config,
229229
opts.jobs,
230+
false, // --keep-going
230231
opts.target.iter().map(|x| x.into()).collect::<Vec<String>>().as_slice(),
231232
CompileMode::Check { test: cfg_test },
232233
)?,

0 commit comments

Comments
 (0)