bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

Add try_canonicalize to rustc_fs_util and use it over fs::canonicalize

Browse source
This commit is contained in:
John Kåre Alsaker 2023-03-16 21:42:31 +01:00
parent 7ac4b82ddd
commit 4f7cd3d459
11 changed files with 31 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

5
compiler/rustc_interface/src/passes.rs
View file

@ -12,6 +12,7 @@ use rustc_data_structures::steal::Steal;
use rustc_data_structures::sync::{Lrc, OnceCell, WorkerLocal};
use rustc_errors::PResult;
use rustc_expand::base::{ExtCtxt, LintStoreExpand};
use rustc_fs_util::try_canonicalize;
use rustc_hir::def_id::{StableCrateId, LOCAL_CRATE};
use rustc_lint::{unerased_lint_store, BufferedEarlyLint, EarlyCheckNode, LintStore};
use rustc_metadata::creader::CStore;
@ -405,12 +406,12 @@ where
}
fn output_contains_path(output_paths: &[PathBuf], input_path: &Path) -> bool {
let input_path = input_path.canonicalize().ok();
let input_path = try_canonicalize(input_path).ok();
if input_path.is_none() {
return false;
}
let check = |output_path: &PathBuf| {
if output_path.canonicalize().ok() == input_path { Some(()) } else { None }
if try_canonicalize(output_path).ok() == input_path { Some(()) } else { None }
};
check_output(output_paths, check).is_some()
}