Skip to content

Commit 7465192

Browse files
committed
simplify logic for split_file_at_dot
1 parent b1d84f7 commit 7465192

File tree

1 file changed

+4
-8
lines changed

1 file changed

+4
-8
lines changed

library/std/src/path.rs

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -346,15 +346,11 @@ fn split_file_at_dot(file: &OsStr) -> (Option<&OsStr>, Option<&OsStr>) {
346346
// only from ASCII-bounded slices of existing &OsStr values.
347347
let i = match slice[1..].iter().position(|b| *b == b'.') {
348348
Some(i) => i + 1,
349-
None => slice.len(),
349+
None => return (Some(file), None),
350350
};
351-
if i == slice.len() {
352-
(Some(file), None)
353-
} else {
354-
let before = Some(&slice[..i]);
355-
let after = Some(&slice[i + 1..]);
356-
unsafe { (before.map(|s| u8_slice_as_os_str(s)), after.map(|s| u8_slice_as_os_str(s))) }
357-
}
351+
let before = &slice[..i];
352+
let after = &slice[i + 1..];
353+
unsafe { (Some(u8_slice_as_os_str(before)), Some(u8_slice_as_os_str(after))) }
358354
}
359355

360356
////////////////////////////////////////////////////////////////////////////////

0 commit comments

Comments
 (0)