user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

simplify logic for split_file_at_dot

Browse source
This commit is contained in:
Michael Hall 2021-06-15 14:00:22 +10:00
parent b1d84f721e
commit 7465192c7d
1 changed files with 4 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

12
library/std/src/path.rs
View file

@ -346,15 +346,11 @@ fn split_file_at_dot(file: &OsStr) -> (Option<&OsStr>, Option<&OsStr>) {
// only from ASCII-bounded slices of existing &OsStr values.
let i = match slice[1..].iter().position(|b| *b == b'.') {
Some(i) => i + 1,
None => slice.len(),
None => return (Some(file), None),
};
if i == slice.len() {
(Some(file), None)
} else {
let before = Some(&slice[..i]);
let after = Some(&slice[i + 1..]);
unsafe { (before.map(|s| u8_slice_as_os_str(s)), after.map(|s| u8_slice_as_os_str(s))) }
}
let before = &slice[..i];
let after = &slice[i + 1..];
unsafe { (Some(u8_slice_as_os_str(before)), Some(u8_slice_as_os_str(after))) }
}
////////////////////////////////////////////////////////////////////////////////