mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Auto merge of #81414 - rylev:fetch-rmeta-crates, r=petrochenkov

Browse Source 
Check for rmeta crates when getting existing crates from cache

This change makes sure to check for rmeta files when resolving crates instead of always going to disk in that case.
This commit is contained in:
bors 2021-01-28 01:29:47 +00:00
commit e32f372c42
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
compiler/rustc_metadata/src/creader.rs
View File

@ -253,8 +253,9 @@ fn existing_match(&self, name: Symbol, hash: Option<Svh>, kind: PathKind) -> Opt
if let Some(mut files) = entry.files() {
if files.any(|l| {
let l = fs::canonicalize(l).unwrap_or(l.clone().into());
source.dylib.as_ref().map(|p| &p.0) == Some(&l)
|| source.rlib.as_ref().map(|p| &p.0) == Some(&l)
source.dylib.as_ref().map(|(p, _)| p) == Some(&l)
|| source.rlib.as_ref().map(|(p, _)| p) == Some(&l)
|| source.rmeta.as_ref().map(|(p, _)| p) == Some(&l)
}) {
ret = Some(cnum);
}