diff options
| author | John Kåre Alsaker <john.kare.alsaker@gmail.com> | 2023-03-16 21:42:31 +0100 |
|---|---|---|
| committer | John Kåre Alsaker <john.kare.alsaker@gmail.com> | 2023-03-16 21:50:23 +0100 |
| commit | 4f7cd3d4591aefc4edec1039ac49bef94d65deb1 (patch) | |
| tree | 744a3b3b42c26c924c69c42ce5e75589a164198b /compiler/rustc_interface/src/passes.rs | |
| parent | 7ac4b82ddd596a218cac8cd6b88a91b54fcdcf13 (diff) | |
| download | rust-4f7cd3d4591aefc4edec1039ac49bef94d65deb1.tar.gz rust-4f7cd3d4591aefc4edec1039ac49bef94d65deb1.zip | |
Add `try_canonicalize` to `rustc_fs_util` and use it over `fs::canonicalize`
Diffstat (limited to 'compiler/rustc_interface/src/passes.rs')
| -rw-r--r-- | compiler/rustc_interface/src/passes.rs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/compiler/rustc_interface/src/passes.rs b/compiler/rustc_interface/src/passes.rs index 71bdd4df95b..b392624a953 100644 --- a/compiler/rustc_interface/src/passes.rs +++ b/compiler/rustc_interface/src/passes.rs @@ -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() } |
