Ensure that pushing empty path works as before
Fixes: https://github.com/rust-lang/rust/issues/89658
This commit is contained in:
parent
7807a694c2
commit
1bb399c342
2 changed files with 5 additions and 1 deletions
|
@ -1208,6 +1208,9 @@ impl PathBuf {
|
|||
/// * if `path` has a root but no prefix (e.g., `\windows`), it
|
||||
/// replaces everything except for the prefix (if any) of `self`.
|
||||
/// * if `path` has a prefix but no root, it replaces `self`.
|
||||
/// * if `self` has a verbatim prefix (e.g. `\\?\C:\windows`)
|
||||
/// and `path` is not empty, the new path is normalized: all references
|
||||
/// to `.` and `..` are removed.
|
||||
///
|
||||
/// # Examples
|
||||
///
|
||||
|
@ -1254,7 +1257,7 @@ impl PathBuf {
|
|||
self.as_mut_vec().truncate(0);
|
||||
|
||||
// verbatim paths need . and .. removed
|
||||
} else if comps.prefix_verbatim() {
|
||||
} else if comps.prefix_verbatim() && !path.inner.is_empty() {
|
||||
let mut buf: Vec<_> = comps.collect();
|
||||
for c in path.components() {
|
||||
match c {
|
||||
|
|
|
@ -1271,6 +1271,7 @@ pub fn test_push() {
|
|||
tp!(r"\\?\A:\x\y", "/foo", r"\\?\A:\foo");
|
||||
tp!(r"\\?\A:", r"..\foo\.", r"\\?\A:\foo");
|
||||
tp!(r"\\?\A:\x\y", r".\foo\.", r"\\?\A:\x\y\foo");
|
||||
tp!(r"\\?\A:\x\y", r"", r"\\?\A:\x\y\");
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue