Merge pull request #1782 from ehuss/update-cargo

Update cargo
rust-lang · Aug 3, 2022 · 4d8b0a1 · 4d8b0a1
2 parents fcf1f94 + 3b16064
commit 4d8b0a1
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 29 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 = "3f052d8eed98c6a24f8b332fb2e6e6249d12d8c1" }
-cargo-util = { git = "https://github.com/rust-lang/cargo", rev = "3f052d8eed98c6a24f8b332fb2e6e6249d12d8c1" }
+cargo = { git = "https://github.com/rust-lang/cargo", rev = "5514f1e0e1b3650ed8a78306198e90b66b292693" }
+cargo-util = { git = "https://github.com/rust-lang/cargo", rev = "5514f1e0e1b3650ed8a78306198e90b66b292693" }
 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
@@ -608,7 +608,7 @@ struct CargoOptions {
     all_features: bool,
     no_default_features: bool,
     features: Vec<String>,
-    jobs: Option<u32>,
+    jobs: Option<i32>,
     all_targets: bool,
 }
 

diff --git a/rls/src/config.rs b/rls/src/config.rs
@@ -145,7 +145,7 @@ pub struct Config {
     pub features: Vec<String>,
     pub all_features: bool,
     pub no_default_features: bool,
-    pub jobs: Option<u32>,
+    pub jobs: Option<i32>,
     pub all_targets: bool,
     /// Enables use of Racer for `textDocument/completion` requests.
     ///