From 28e4a7e5caeb362c700a82af1567486a03ddcdab Mon Sep 17 00:00:00 2001
From: Pietro Albini <pietro.albini@ferrous-systems.com>
Date: Mon, 4 Apr 2022 15:31:20 +0200
Subject: [PATCH] fix rls not building with the latest cargo

---
 Cargo.lock             | 25 ++++++++++++-------------
 Cargo.toml             |  4 ++--
 rls/src/build/cargo.rs |  1 +
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 9393e80331..4865830f2c 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -125,13 +125,13 @@ dependencies = [
 
 [[package]]
 name = "cargo"
-version = "0.61.0"
-source = "git+https://github.com/rust-lang/cargo?rev=d6cdde584a1f15ea086bae922e20fd27f7165431#d6cdde584a1f15ea086bae922e20fd27f7165431"
+version = "0.62.0"
+source = "git+https://github.com/rust-lang/cargo?rev=1ef1e0a12723ce9548d7da2b63119de9002bead8#1ef1e0a12723ce9548d7da2b63119de9002bead8"
 dependencies = [
  "anyhow",
  "atty",
  "bytesize",
- "cargo-platform 0.1.2 (git+https://github.com/rust-lang/cargo?rev=d6cdde584a1f15ea086bae922e20fd27f7165431)",
+ "cargo-platform 0.1.2 (git+https://github.com/rust-lang/cargo?rev=1ef1e0a12723ce9548d7da2b63119de9002bead8)",
  "cargo-util",
  "clap 3.1.2",
  "crates-io",
@@ -158,7 +158,6 @@ dependencies = [
  "libgit2-sys",
  "log",
  "memchr",
- "num_cpus",
  "opener",
  "os_info",
  "percent-encoding 2.1.0",
@@ -193,7 +192,7 @@ dependencies = [
 [[package]]
 name = "cargo-platform"
 version = "0.1.2"
-source = "git+https://github.com/rust-lang/cargo?rev=d6cdde584a1f15ea086bae922e20fd27f7165431#d6cdde584a1f15ea086bae922e20fd27f7165431"
+source = "git+https://github.com/rust-lang/cargo?rev=1ef1e0a12723ce9548d7da2b63119de9002bead8#1ef1e0a12723ce9548d7da2b63119de9002bead8"
 dependencies = [
  "serde",
 ]
@@ -201,7 +200,7 @@ dependencies = [
 [[package]]
 name = "cargo-util"
 version = "0.1.2"
-source = "git+https://github.com/rust-lang/cargo?rev=d6cdde584a1f15ea086bae922e20fd27f7165431#d6cdde584a1f15ea086bae922e20fd27f7165431"
+source = "git+https://github.com/rust-lang/cargo?rev=1ef1e0a12723ce9548d7da2b63119de9002bead8#1ef1e0a12723ce9548d7da2b63119de9002bead8"
 dependencies = [
  "anyhow",
  "core-foundation",
@@ -367,7 +366,7 @@ checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc"
 [[package]]
 name = "crates-io"
 version = "0.34.0"
-source = "git+https://github.com/rust-lang/cargo?rev=d6cdde584a1f15ea086bae922e20fd27f7165431#d6cdde584a1f15ea086bae922e20fd27f7165431"
+source = "git+https://github.com/rust-lang/cargo?rev=1ef1e0a12723ce9548d7da2b63119de9002bead8#1ef1e0a12723ce9548d7da2b63119de9002bead8"
 dependencies = [
  "anyhow",
  "curl",
@@ -777,9 +776,9 @@ dependencies = [
 
 [[package]]
 name = "git2"
-version = "0.13.24"
+version = "0.14.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "845e007a28f1fcac035715988a234e8ec5458fd825b20a20c7dec74237ef341f"
+checksum = "3826a6e0e2215d7a41c2bfc7c9244123969273f3476b939a226aac0ab56e9e3c"
 dependencies = [
  "bitflags",
  "libc",
@@ -792,9 +791,9 @@ dependencies = [
 
 [[package]]
 name = "git2-curl"
-version = "0.14.1"
+version = "0.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "883539cb0ea94bab3f8371a98cd8e937bbe9ee7c044499184aa4c17deb643a50"
+checksum = "1ee51709364c341fbb6fe2a385a290fb9196753bdde2fc45447d27cd31b11b13"
 dependencies = [
  "curl",
  "git2",
@@ -1132,9 +1131,9 @@ checksum = "8521a1b57e76b1ec69af7599e75e38e7b7fad6610f037db8c79b127201b5d119"
 
 [[package]]
 name = "libgit2-sys"
-version = "0.12.25+1.3.0"
+version = "0.13.2+1.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f68169ef08d6519b2fe133ecc637408d933c0174b23b80bb2f79828966fbaab"
+checksum = "3a42de9a51a5c12e00fc0e4ca6bc2ea43582fc6418488e8f615e905d886f258b"
 dependencies = [
  "cc",
  "libc",
diff --git a/Cargo.toml b/Cargo.toml
index db2a2362c1..3300063c91 100644
--- 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
index 51e59c32dd..36efbe45df 100644
--- 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 },
         )?,