From 36835b704f70e595032b058c1bc33fd7e2775d30 Mon Sep 17 00:00:00 2001 From: Ryan Levick Date: Tue, 26 Jan 2021 19:39:24 +0100 Subject: [PATCH] Check for rmeta crates when getting existing crates from cache --- compiler/rustc_metadata/src/creader.rs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/compiler/rustc_metadata/src/creader.rs b/compiler/rustc_metadata/src/creader.rs index a7bf79d7e6743..f203094fc73df 100644 --- a/compiler/rustc_metadata/src/creader.rs +++ b/compiler/rustc_metadata/src/creader.rs @@ -253,8 +253,9 @@ impl<'a> CrateLoader<'a> { 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); }