argument of pathbuf replaced with string due to pathbuf not being needed
This commit is contained in:
parent
c5f5d20ed6
commit
8cb8a2e3a4
1 changed files with 3 additions and 5 deletions
|
@ -262,13 +262,13 @@ fn run(paths: Vec<PathBuf>, cfg: &Config) {
|
||||||
if !are_hardlinked(f1, f2) && cmp(f1, f2).unwrap_or(false) {
|
if !are_hardlinked(f1, f2) && cmp(f1, f2).unwrap_or(false) {
|
||||||
if !cfg.dry_run {
|
if !cfg.dry_run {
|
||||||
if let Err(msg) = hardlink(f1, f2) {
|
if let Err(msg) = hardlink(f1, f2) {
|
||||||
eprintln!("{}: {}", msg, format_pair(f1, f2, cfg));
|
eprintln!("{}: {}", msg, format_pair(&f1.to_string_lossy(), &f2.to_string_lossy(), cfg));
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if let Some(stdout_buffer) = &mut stdout_buffer {
|
if let Some(stdout_buffer) = &mut stdout_buffer {
|
||||||
if cfg.verbosity >= 0 {
|
if cfg.verbosity >= 0 {
|
||||||
writeln!(stdout_buffer, "hardlinked {}", format_pair(f1, f2, cfg)).unwrap();
|
writeln!(stdout_buffer, "hardlinked {}", format_pair(&f1.to_string_lossy(), &f2.to_string_lossy(), cfg)).unwrap();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -292,9 +292,7 @@ fn hardlink(f1: &PathBuf, f2: &PathBuf) -> Result<(), &'static str> {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
fn format_pair(f1: &PathBuf, f2: &PathBuf, cfg: &Config) -> String {
|
fn format_pair(f1s: &str, f2s: &str, cfg: &Config) -> String {
|
||||||
let f1s = f1.to_string_lossy();
|
|
||||||
let f2s = f2.to_string_lossy();
|
|
||||||
if cfg.no_brace_output {
|
if cfg.no_brace_output {
|
||||||
return format!(
|
return format!(
|
||||||
"{} {}",
|
"{} {}",
|
||||||
|
|
Loading…
Add table
Reference in a new issue