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

Commit d60b6c9

Browse files
authored
Merge pull request #1626 from matthiaskrgr/update_cargo
deps: update cargo
2 parents b27e117 + 7b5471b commit d60b6c9

File tree

4 files changed

+31
-16
lines changed

4 files changed

+31
-16
lines changed

Cargo.lock

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

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ rls-vfs = "0.8"
3030
rls-ipc = { version = "0.1.0", path = "rls-ipc", optional = true }
3131

3232
anyhow = "1.0.26"
33-
cargo = { git = "https://github.com/rust-lang/cargo", rev = "735f648b35f5dd771a5b23a65bc465aee8639c56" }
33+
cargo = { git = "https://github.com/rust-lang/cargo", rev = "972b9f55a72e3eae21c826b2f806c753696ef2ec" }
3434
cargo_metadata = "0.8"
3535
clippy_lints = { git = "https://github.com/rust-lang/rust-clippy", rev = "05b46034ea734f2b4436b700452771652ecc0074", optional = true }
3636
env_logger = "0.7"

rls/src/actions/diagnostics.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -335,8 +335,7 @@ mod diagnostic_message_test {
335335
}
336336

337337
fn to_messages(&self) -> Vec<(String, Vec<String>)> {
338-
(self
339-
.single_file_results()
338+
self.single_file_results()
340339
.iter()
341340
.map(|(diagnostic, _)| {
342341
(
@@ -350,7 +349,7 @@ mod diagnostic_message_test {
350349
.collect(),
351350
)
352351
})
353-
.collect())
352+
.collect()
354353
}
355354

356355
fn to_primary_messages(&self) -> Vec<String> {

rls/src/project_model.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ impl ProjectModel {
4848
// Enable nightly flag for cargo(see #1043)
4949
cargo::core::enable_nightly_features();
5050
// frozen = false, locked = false, offline = false
51-
config.configure(0, Some(true), None, false, false, false, &None, &[], &[])?;
51+
config.configure(0, true, None, false, false, false, &None, &[], &[])?;
5252
let ws = Workspace::new(&ws_manifest, &config)?;
5353
// get resolve from lock file
5454
let prev = {

0 commit comments

Comments
 (0)