Unnamed repository; edit this file 'description' to name the repository.
Merge #10966
10966: fix: Fix library target overriding sysroot deps r=jonas-schievink a=jonas-schievink
Fixes https://github.com/rust-analyzer/rust-analyzer/issues/10827
bors r+
Co-authored-by: Jonas Schievink <[email protected]>
| -rw-r--r-- | crates/project_model/src/workspace.rs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/crates/project_model/src/workspace.rs b/crates/project_model/src/workspace.rs index 0335f8b174..60f99f368b 100644 --- a/crates/project_model/src/workspace.rs +++ b/crates/project_model/src/workspace.rs @@ -595,6 +595,9 @@ fn cargo_to_crate_graph( // Set deps to the core, std and to the lib target of the current package for (from, kind) in pkg_crates.get(&pkg).into_iter().flatten() { + // Add sysroot deps first so that a lib target named `core` etc. can overwrite them. + public_deps.add(*from, &mut crate_graph); + if let Some((to, name)) = lib_tgt.clone() { if to != *from && *kind != TargetKind::BuildScript { // (build script can not depend on its library target) @@ -606,7 +609,6 @@ fn cargo_to_crate_graph( add_dep(&mut crate_graph, *from, name, to); } } - public_deps.add(*from, &mut crate_graph); } } |