Merge pull request #3103 from water-ghosts/fs-nonexistent-directory

Don't panic when canonicalizing a nonexistent path
This commit is contained in:
Sylvestre Ledru 2022-02-10 22:38:05 +01:00 committed by GitHub
commit 338ab17c40
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -299,9 +299,8 @@ pub fn canonicalize<P: AsRef<Path>>(
let original = if original.is_absolute() {
original.to_path_buf()
} else {
dunce::canonicalize(env::current_dir().unwrap())
.unwrap()
.join(original)
let current_dir = env::current_dir()?;
dunce::canonicalize(current_dir)?.join(original)
};
let mut result = PathBuf::new();