diff --git a/Cargo.lock b/Cargo.lock index e691f57fe60..af62c8366f9 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -160,16 +160,17 @@ dependencies = [ [[package]] name = "cargo" -version = "0.43.0" -source = "git+https://github.com/rust-lang/cargo?rev=735f648b35f5dd771a5b23a65bc465aee8639c56#735f648b35f5dd771a5b23a65bc465aee8639c56" +version = "0.44.0" +source = "git+https://github.com/rust-lang/cargo?rev=972b9f55a72e3eae21c826b2f806c753696ef2ec#972b9f55a72e3eae21c826b2f806c753696ef2ec" dependencies = [ "anyhow 1.0.26 (registry+https://github.com/rust-lang/crates.io-index)", "atty 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)", "bytesize 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "cargo-platform 0.1.1 (git+https://github.com/rust-lang/cargo?rev=735f648b35f5dd771a5b23a65bc465aee8639c56)", + "cargo-platform 0.1.1 (git+https://github.com/rust-lang/cargo?rev=972b9f55a72e3eae21c826b2f806c753696ef2ec)", "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)", "core-foundation 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "crates-io 0.31.0 (git+https://github.com/rust-lang/cargo?rev=735f648b35f5dd771a5b23a65bc465aee8639c56)", + "crates-io 0.31.0 (git+https://github.com/rust-lang/cargo?rev=972b9f55a72e3eae21c826b2f806c753696ef2ec)", + "crossbeam-channel 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "crypto-hash 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", "curl 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)", @@ -184,7 +185,7 @@ dependencies = [ "glob 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "hex 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "home 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", - "humantime 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "humantime 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "ignore 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)", "im-rc 14.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "jobserver 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", @@ -221,7 +222,7 @@ dependencies = [ [[package]] name = "cargo-platform" version = "0.1.1" -source = "git+https://github.com/rust-lang/cargo?rev=735f648b35f5dd771a5b23a65bc465aee8639c56#735f648b35f5dd771a5b23a65bc465aee8639c56" +source = "git+https://github.com/rust-lang/cargo?rev=972b9f55a72e3eae21c826b2f806c753696ef2ec#972b9f55a72e3eae21c826b2f806c753696ef2ec" dependencies = [ "serde 1.0.99 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -343,7 +344,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "crates-io" version = "0.31.0" -source = "git+https://github.com/rust-lang/cargo?rev=735f648b35f5dd771a5b23a65bc465aee8639c56#735f648b35f5dd771a5b23a65bc465aee8639c56" +source = "git+https://github.com/rust-lang/cargo?rev=972b9f55a72e3eae21c826b2f806c753696ef2ec#972b9f55a72e3eae21c826b2f806c753696ef2ec" dependencies = [ "anyhow 1.0.26 (registry+https://github.com/rust-lang/crates.io-index)", "curl 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)", @@ -370,6 +371,14 @@ dependencies = [ "crossbeam-utils 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "crossbeam-channel" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "crossbeam-deque" version = "0.6.3" @@ -762,6 +771,11 @@ dependencies = [ "quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "humantime" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" + [[package]] name = "idna" version = "0.2.0" @@ -1609,7 +1623,7 @@ name = "rls" version = "1.41.0" dependencies = [ "anyhow 1.0.26 (registry+https://github.com/rust-lang/crates.io-index)", - "cargo 0.43.0 (git+https://github.com/rust-lang/cargo?rev=735f648b35f5dd771a5b23a65bc465aee8639c56)", + "cargo 0.44.0 (git+https://github.com/rust-lang/cargo?rev=972b9f55a72e3eae21c826b2f806c753696ef2ec)", "cargo_metadata 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", "clippy_lints 0.0.212 (git+https://github.com/rust-lang/rust-clippy?rev=05b46034ea734f2b4436b700452771652ecc0074)", "crossbeam-channel 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2701,8 +2715,8 @@ dependencies = [ "checksum bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)" = "206fdffcfa2df7cbe15601ef46c813fce0965eb3286db6b56c583b814b51c81c" "checksum bytesize 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "716960a18f978640f25101b5cbf1c6f6b0d3192fab36a2d98ca96f0ecbe41010" "checksum c2-chacha 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7d64d04786e0f528460fc884753cf8dddcc466be308f6026f8e355c41a0e4101" -"checksum cargo 0.43.0 (git+https://github.com/rust-lang/cargo?rev=735f648b35f5dd771a5b23a65bc465aee8639c56)" = "" -"checksum cargo-platform 0.1.1 (git+https://github.com/rust-lang/cargo?rev=735f648b35f5dd771a5b23a65bc465aee8639c56)" = "" +"checksum cargo 0.44.0 (git+https://github.com/rust-lang/cargo?rev=972b9f55a72e3eae21c826b2f806c753696ef2ec)" = "" +"checksum cargo-platform 0.1.1 (git+https://github.com/rust-lang/cargo?rev=972b9f55a72e3eae21c826b2f806c753696ef2ec)" = "" "checksum cargo_metadata 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)" = "700b3731fd7d357223d0000f4dbf1808401b694609035c3c411fbc0cd375c426" "checksum cargo_metadata 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8d2d1617e838936c0d2323a65cc151e03ae19a7678dd24f72bccf27119b90a5d" "checksum cc 1.0.48 (registry+https://github.com/rust-lang/crates.io-index)" = "f52a465a666ca3d838ebbf08b241383421412fe7ebb463527bba275526d89f76" @@ -2715,9 +2729,10 @@ dependencies = [ "checksum constant_time_eq 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "995a44c877f9212528ccc74b21a232f66ad69001e40ede5bcee2ac9ef2657120" "checksum core-foundation 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "57d24c7a13c43e870e37c1556b74555437870a04514f7685f5b354e090567171" "checksum core-foundation-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b3a71ab494c0b5b860bdc8407ae08978052417070c2ced38573a9157ad75b8ac" -"checksum crates-io 0.31.0 (git+https://github.com/rust-lang/cargo?rev=735f648b35f5dd771a5b23a65bc465aee8639c56)" = "" +"checksum crates-io 0.31.0 (git+https://github.com/rust-lang/cargo?rev=972b9f55a72e3eae21c826b2f806c753696ef2ec)" = "" "checksum crc32fast 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ba125de2af0df55319f41944744ad91c71113bf74a4646efff39afe1f6842db1" "checksum crossbeam-channel 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "c8ec7fcd21571dc78f96cc96243cab8d8f035247c3efd16c687be154c3fa9efa" +"checksum crossbeam-channel 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "acec9a3b0b3559f15aee4f90746c4e5e293b701c0f7d3925d24e01645267b68c" "checksum crossbeam-deque 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)" = "05e44b8cf3e1a625844d1750e1f7820da46044ff6d28f4d43e455ba3e5bb2c13" "checksum crossbeam-deque 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b18cd2e169ad86297e6bc0ad9aa679aee9daa4f19e8163860faf7c164e4f5a71" "checksum crossbeam-epoch 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "fedcd6772e37f3da2a9af9bf12ebe046c0dfe657992377b4df982a2b54cd37a9" @@ -2762,6 +2777,7 @@ dependencies = [ "checksum hex 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "023b39be39e3a2da62a94feb433e91e8bcd37676fbc8bea371daf52b7a769a3e" "checksum home 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a3753954f7bd71f0e671afb8b5a992d1724cf43b7f95a563cd4a0bde94659ca8" "checksum humantime 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f" +"checksum humantime 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b9b6c53306532d3c8e8087b44e6580e10db51a023cf9b433cea2ac38066b92da" "checksum idna 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "02e2673c30ee86b5b96a9cb52ad15718aa1f966f5ab9ad54a8b95d5ca33120a9" "checksum if_chain 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c3360c7b59e5ffa2653671fb74b4741a5d343c03f331c0a4aeda42b5c2b0ec7d" "checksum ignore 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)" = "0ec16832258409d571aaef8273f3c3cc5b060d784e159d1a0f3b0017308f84a7" diff --git a/Cargo.toml b/Cargo.toml index 532f4b02f8f..d30c863de86 100644 --- 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 = "735f648b35f5dd771a5b23a65bc465aee8639c56" } +cargo = { git = "https://github.com/rust-lang/cargo", rev = "972b9f55a72e3eae21c826b2f806c753696ef2ec" } cargo_metadata = "0.8" clippy_lints = { git = "https://github.com/rust-lang/rust-clippy", rev = "05b46034ea734f2b4436b700452771652ecc0074", optional = true } env_logger = "0.7" diff --git a/rls/src/actions/diagnostics.rs b/rls/src/actions/diagnostics.rs index cf008f9bef8..44529019477 100644 --- a/rls/src/actions/diagnostics.rs +++ b/rls/src/actions/diagnostics.rs @@ -335,8 +335,7 @@ mod diagnostic_message_test { } fn to_messages(&self) -> Vec<(String, Vec)> { - (self - .single_file_results() + self.single_file_results() .iter() .map(|(diagnostic, _)| { ( @@ -350,7 +349,7 @@ mod diagnostic_message_test { .collect(), ) }) - .collect()) + .collect() } fn to_primary_messages(&self) -> Vec { diff --git a/rls/src/project_model.rs b/rls/src/project_model.rs index 97cbc8cd33e..32b027e098b 100644 --- a/rls/src/project_model.rs +++ b/rls/src/project_model.rs @@ -48,7 +48,7 @@ impl ProjectModel { // Enable nightly flag for cargo(see #1043) cargo::core::enable_nightly_features(); // frozen = false, locked = false, offline = false - config.configure(0, Some(true), None, false, false, false, &None, &[], &[])?; + config.configure(0, true, None, false, false, false, &None, &[], &[])?; let ws = Workspace::new(&ws_manifest, &config)?; // get resolve from lock file let prev = {