mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use as_os_str to compare exact paths

Browse Source
This commit is contained in:
Chris Denton 2022-03-05 18:15:58 +00:00
parent 27f6d2c7f6
commit 3009eec10d
No known key found for this signature in database
GPG Key ID: 713472F2F45627DE
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
library/std/src/path/tests.rs
View File

@ -1731,11 +1731,11 @@ fn test_windows_absolute() {
let relative = r"a\b"; let relative = r"a\b";
let mut expected = crate::env::current_dir().unwrap(); let mut expected = crate::env::current_dir().unwrap();
expected.push(relative); expected.push(relative);
assert_eq!(absolute(relative).unwrap(), expected); assert_eq!(absolute(relative).unwrap().as_os_str(), expected.as_os_str());
macro_rules! unchanged( macro_rules! unchanged(
($path:expr) => { ($path:expr) => {
assert_eq!(absolute($path).unwrap(), Path::new($path)); assert_eq!(absolute($path).unwrap().as_os_str(), Path::new($path).as_os_str());
} }
); );
@ -1751,7 +1751,10 @@ macro_rules! unchanged(
// Verbatim paths are always unchanged, no matter what. // Verbatim paths are always unchanged, no matter what.
unchanged!(r"\\?\path.\to/file.."); unchanged!(r"\\?\path.\to/file..");
assert_eq!(absolute(r"C:\path..\to.\file.").unwrap(), Path::new(r"C:\path..\to\file")); assert_eq!(
absolute(r"C:\path..\to.\file.").unwrap().as_os_str(),
Path::new(r"C:\path..\to\file").as_os_str()
);
assert_eq!(absolute(r"COM1").unwrap().as_os_str(), Path::new(r"\\.\COM1").as_os_str()); assert_eq!(absolute(r"COM1").unwrap().as_os_str(), Path::new(r"\\.\COM1").as_os_str());
} }