bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Check for rmeta crates when getting existing crates from cache

Browse source
This commit is contained in:
Ryan Levick 2021-01-26 19:39:24 +01:00
parent 84864bfea9
commit 36835b704f
1 changed files with 3 additions and 2 deletions
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 @@ impl<'a> CrateLoader<'a> {
if let Some(mut files) = entry.files() { if let Some(mut files) = entry.files() {
if files.any(|l| { if files.any(|l| {
let l = fs::canonicalize(l).unwrap_or(l.clone().into()); let l = fs::canonicalize(l).unwrap_or(l.clone().into());
source.dylib.as_ref().map(|p| &p.0) == Some(&l) source.dylib.as_ref().map(|(p, _)| p) == Some(&l)
|| source.rlib.as_ref().map(|p| &p.0) == Some(&l) || source.rlib.as_ref().map(|(p, _)| p) == Some(&l)
|| source.rmeta.as_ref().map(|(p, _)| p) == Some(&l)
}) { }) {
ret = Some(cnum); ret = Some(cnum);
} }