Skip to content

Commit dc1f620

Browse files
committed
remove unnecessary empty check
1 parent ec6ebed commit dc1f620

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

std/src/path.rs

+1-3
Original file line numberDiff line numberDiff line change
@@ -2217,9 +2217,7 @@ impl Path {
22172217
///
22182218
#[unstable(feature = "path_file_prefix", issue = "86319")]
22192219
pub fn file_prefix(&self) -> Option<&OsStr> {
2220-
self.file_name()
2221-
.map(split_file_at_dot)
2222-
.and_then(|(before, after)| if before.is_empty() { after } else { Some(before) })
2220+
self.file_name().map(split_file_at_dot).and_then(|(before, _after)| Some(before))
22232221
}
22242222

22252223
/// Extracts the extension of [`self.file_name`], if possible.

std/src/path/tests.rs

+4
Original file line numberDiff line numberDiff line change
@@ -1127,6 +1127,8 @@ pub fn test_stem_ext() {
11271127

11281128
t!(".x.y.z", file_stem: Some(".x.y"), extension: Some("z"));
11291129

1130+
t!("..x.y.z", file_stem: Some("..x.y"), extension: Some("z"));
1131+
11301132
t!("", file_stem: None, extension: None);
11311133
}
11321134

@@ -1168,6 +1170,8 @@ pub fn test_prefix_ext() {
11681170

11691171
t!(".x.y.z", file_prefix: Some(".x"), extension: Some("z"));
11701172

1173+
t!("..x.y.z", file_prefix: Some("."), extension: Some("z"));
1174+
11711175
t!("", file_prefix: None, extension: None);
11721176
}
11731177

0 commit comments

Comments
 (0)