bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Don't canonicalize crate paths

Browse source
This commit is contained in:
Chris Denton 2025-04-15 01:01:51 +00:00
parent 2da29dbe8f
commit 2024e26881
No known key found for this signature in database
GPG key ID: 713472F2F45627DE
1 changed files with 15 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

15
compiler/rustc_metadata/src/locator.rs
View file

@ -427,12 +427,21 @@ impl<'a> CrateLocator<'a> {
let (rlibs, rmetas, dylibs) = let (rlibs, rmetas, dylibs) =
candidates.entry(hash.to_string()).or_default(); candidates.entry(hash.to_string()).or_default();
let path = {
try_canonicalize(&spf.path).unwrap_or_else(|_| spf.path.to_path_buf()); // As a perforamnce optimisation we canonicalize the path and skip
// ones we've already seeen. This allows us to ignore crates
// we know are exactual equal to ones we've already found.
// Going to the same crate through different symlinks does not change the result.
let path = try_canonicalize(&spf.path)
.unwrap_or_else(|_| spf.path.to_path_buf());
if seen_paths.contains(&path) { if seen_paths.contains(&path) {
continue; continue;
}; };
seen_paths.insert(path.clone()); seen_paths.insert(path);
}
// Use the original path (potentially with unresolved symlinks),
// filesystem code should not care, but this is nicer for diagnostics.
let path = spf.path.to_path_buf();
match kind { match kind {
CrateFlavor::Rlib => rlibs.insert(path, search_path.kind), CrateFlavor::Rlib => rlibs.insert(path, search_path.kind),
CrateFlavor::Rmeta => rmetas.insert(path, search_path.kind), CrateFlavor::Rmeta => rmetas.insert(path, search_path.kind),