Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2025-01-27 20:35:09 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge #10966

Browse source 
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 <jonas.schievink@ferrous-systems.com>
This commit is contained in:
bors[bot] 2021-12-08 16:12:37 +00:00 committed by GitHub
commit 020242ff0e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
crates/project_model/src/workspace.rs
View file

@ -595,6 +595,9 @@ fn cargo_to_crate_graph(
// Set deps to the core, std and to the lib target of the current package // 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() { 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 let Some((to, name)) = lib_tgt.clone() {
if to != *from && *kind != TargetKind::BuildScript { if to != *from && *kind != TargetKind::BuildScript {
// (build script can not depend on its library target) // (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); add_dep(&mut crate_graph, *from, name, to);
} }
} }
public_deps.add(*from, &mut crate_graph);
} }
} }