Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2024-12-26 04:43:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

Minor cleanup of path_normalize_for_cd

Browse source
This commit is contained in:
Peter Ammon 2024-08-03 12:27:05 -07:00
parent b31b77cf83
commit 1c38677db0
No known key found for this signature in database
1 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/wutil/mod.rs
View file

@ -330,15 +330,14 @@ pub fn path_normalize_for_cd(wd: &wstr, path: &wstr) -> WString {
let mut paths = wd_comps;
paths.extend(path_comps);
let mut result =
WString::with_capacity(paths.iter().fold(0, |sum, s| sum + s.len()) + paths.len() + 1);
result.push(SEP);
// TODO: intersperse() https://github.com/rust-lang/rust/issues/79524
for (i, p) in paths.iter().enumerate() {
if i != 0 {
result.push(SEP);
}
WString::with_capacity(paths.iter().fold(paths.len() + 1, |sum, s| sum + s.len()));
for p in paths.iter() {
result.push(SEP);
result.push_utfstr(*p);
}
if result.is_empty() {
result.push(SEP);
}
result
}