Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2025-01-15 22:44:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

Use char_at instead of to_char_slice()

Browse source
This commit is contained in:
ridiculousfish 2023-03-12 19:07:00 -07:00
parent f54a45d09c
commit 33fd679f68
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
fish-rust/src/path.rs
View file

@ -12,8 +12,7 @@ pub fn path_apply_working_directory(path: &wstr, working_directory: &wstr) -> WS
// We're going to make sure that if we want to prepend the wd, that the string has no leading // We're going to make sure that if we want to prepend the wd, that the string has no leading
// "/". // "/".
let prepend_wd = let prepend_wd = path.char_at(0) != '/' && path.char_at(0) != HomeDirectory.into();
path.as_char_slice()[0] != '/' && path.as_char_slice()[0] != HomeDirectory.into();
if !prepend_wd { if !prepend_wd {
// No need to prepend the wd, so just return the path we were given. // No need to prepend the wd, so just return the path we were given.
@ -42,7 +41,7 @@ pub fn append_path_component(path: &mut WString, component: &wstr) {
path.push_utfstr(component); path.push_utfstr(component);
} else { } else {
let path_len = path.len(); let path_len = path.len();
let path_slash = path.as_char_slice()[path_len - 1] == '/'; let path_slash = path.char_at(path_len - 1) == '/';
let comp_slash = component.as_char_slice()[0] == '/'; let comp_slash = component.as_char_slice()[0] == '/';
if !path_slash && !comp_slash { if !path_slash && !comp_slash {
// Need a slash // Need a slash