Skip to content

Commit e32f372

Browse files
committed
Auto merge of #81414 - rylev:fetch-rmeta-crates, r=petrochenkov
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.
2 parents a2f8f62 + 36835b7 commit e32f372

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

compiler/rustc_metadata/src/creader.rs

+3-2
Original file line numberDiff line numberDiff line change
@@ -253,8 +253,9 @@ impl<'a> CrateLoader<'a> {
253253
if let Some(mut files) = entry.files() {
254254
if files.any(|l| {
255255
let l = fs::canonicalize(l).unwrap_or(l.clone().into());
256-
source.dylib.as_ref().map(|p| &p.0) == Some(&l)
257-
|| source.rlib.as_ref().map(|p| &p.0) == Some(&l)
256+
source.dylib.as_ref().map(|(p, _)| p) == Some(&l)
257+
|| source.rlib.as_ref().map(|(p, _)| p) == Some(&l)
258+
|| source.rmeta.as_ref().map(|(p, _)| p) == Some(&l)
258259
}) {
259260
ret = Some(cnum);
260261
}

0 commit comments

Comments
 (0)