language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-03 15:15:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Sort cargo metadata

Browse source 
See https://github.com/rust-lang/cargo/issues/8477

We need this to prevent spurious workspace reloads
This commit is contained in:
Aleksey Kladov 2020-07-10 22:28:41 +02:00
parent be679a02ab
commit 676d2e040d
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
crates/ra_project_model/src/cargo_workspace.rs
View file

@ -155,7 +155,7 @@ impl CargoWorkspace {
if let Some(target) = cargo_features.target.as_ref() { if let Some(target) = cargo_features.target.as_ref() {
meta.other_options(vec![String::from("--filter-platform"), target.clone()]); meta.other_options(vec![String::from("--filter-platform"), target.clone()]);
} }
let meta = meta.exec().with_context(|| { let mut meta = meta.exec().with_context(|| {
format!("Failed to run `cargo metadata --manifest-path {}`", cargo_toml.display()) format!("Failed to run `cargo metadata --manifest-path {}`", cargo_toml.display())
})?; })?;
@ -175,6 +175,7 @@ impl CargoWorkspace {
let ws_members = &meta.workspace_members; let ws_members = &meta.workspace_members;
meta.packages.sort_by(|a, b| a.id.cmp(&b.id));
for meta_pkg in meta.packages { for meta_pkg in meta.packages {
let cargo_metadata::Package { id, edition, name, manifest_path, version, .. } = let cargo_metadata::Package { id, edition, name, manifest_path, version, .. } =
meta_pkg; meta_pkg;
@ -210,7 +211,7 @@ impl CargoWorkspace {
} }
} }
let resolve = meta.resolve.expect("metadata executed with deps"); let resolve = meta.resolve.expect("metadata executed with deps");
for node in resolve.nodes { for mut node in resolve.nodes {
let source = match pkg_by_id.get(&node.id) { let source = match pkg_by_id.get(&node.id) {
Some(&src) => src, Some(&src) => src,
// FIXME: replace this and a similar branch below with `.unwrap`, once // FIXME: replace this and a similar branch below with `.unwrap`, once
@ -221,6 +222,7 @@ impl CargoWorkspace {
continue; continue;
} }
}; };
node.deps.sort_by(|a, b| a.pkg.cmp(&b.pkg));
for dep_node in node.deps { for dep_node in node.deps {
let pkg = match pkg_by_id.get(&dep_node.pkg) { let pkg = match pkg_by_id.get(&dep_node.pkg) {
Some(&pkg) => pkg, Some(&pkg) => pkg,