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

Commit

Permalink
Merge pull request #1626 from matthiaskrgr/update_cargo
Browse files Browse the repository at this point in the history
deps: update cargo
  • Loading branch information
Xanewok authored Feb 4, 2020
2 parents b27e117 + 7b5471b commit d60b6c9
Show file tree
Hide file tree
Showing 4 changed files with 31 additions and 16 deletions.
38 changes: 27 additions & 11 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
5 changes: 2 additions & 3 deletions rls/src/actions/diagnostics.rs
Original file line number Diff line number Diff line change
Expand Up @@ -335,8 +335,7 @@ mod diagnostic_message_test {
}

fn to_messages(&self) -> Vec<(String, Vec<String>)> {
(self
.single_file_results()
self.single_file_results()
.iter()
.map(|(diagnostic, _)| {
(
Expand All @@ -350,7 +349,7 @@ mod diagnostic_message_test {
.collect(),
)
})
.collect())
.collect()
}

fn to_primary_messages(&self) -> Vec<String> {
Expand Down
2 changes: 1 addition & 1 deletion rls/src/project_model.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {
Expand Down

0 comments on commit d60b6c9

Please sign in to comment.