Robot
/
fd
mirror of https://github.com/sharkdp/fd.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use existing Cow pointer

This commit is contained in:
sharkdp 2019-09-15 10:36:40 +02:00 committed by David Peter
parent 8f86a06c1a
commit f14b854bc1
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/output.rs
View File

@ -53,10 +53,12 @@ pub fn print_entry(
}
}
fn replace_path_separator<'a>(config: &FdOptions, str: Cow<'a, str>) -> Cow<'a, str> {
fn replace_path_separator<'a>(config: &FdOptions, path: &mut Cow<'a, str>) {
match &config.path_separator {
None => str,
Some(sep) => Cow::from(str.replace(std::path::MAIN_SEPARATOR, &sep)),
None => {}
Some(sep) => {
*path.to_mut() = path.replace(std::path::MAIN_SEPARATOR, &sep);
}
}
}
@ -75,8 +77,8 @@ fn print_entry_colorized(
.map(Style::to_ansi_term_style)
.unwrap_or(default_style);
let path_string = component.to_string_lossy();
let path_string = replace_path_separator(&config, path_string);
let mut path_string = component.to_string_lossy();
replace_path_separator(&config, &mut path_string);
write!(stdout, "{}", style.paint(path_string))?;
if wants_to_quit.load(Ordering::Relaxed) {
@ -99,7 +101,7 @@ fn print_entry_uncolorized(
) -> io::Result<()> {
let separator = if config.null_separator { "\0" } else { "\n" };
let path_str = path.to_string_lossy();
let path_str = replace_path_separator(&config, path_str);
let mut path_str = path.to_string_lossy();
replace_path_separator(&config, &mut path_str);
write!(stdout, "{}{}", path_str, separator)
}