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

8
compiler/rustc_fs_util/src/lib.rs
View file

@ -1,10 +1,11 @@
#![feature(absolute_path)]
#![deny(rustc::untranslatable_diagnostic)]
#![deny(rustc::diagnostic_outside_of_impl)]
use std::ffi::CString;
use std::fs;
use std::io;
use std::path::{Path, PathBuf};
use std::path::{absolute, Path, PathBuf};
// Unfortunately, on windows, it looks like msvcrt.dll is silently translating
// verbatim paths under the hood to non-verbatim paths! This manifests itself as
@ -91,3 +92,8 @@ pub fn path_to_c_string(p: &Path) -> CString {
pub fn path_to_c_string(p: &Path) -> CString {
CString::new(p.to_str().unwrap()).unwrap()
}
#[inline]
pub fn try_canonicalize<P: AsRef<Path>>(path: P) -> io::Result<PathBuf> {
fs::canonicalize(&path).or_else(|_| absolute(&path))
}