diff options
Diffstat (limited to 'src/subcommands/diff.rs')
-rw-r--r-- | src/subcommands/diff.rs | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/subcommands/diff.rs b/src/subcommands/diff.rs index 30d4e64b..ddaf44d8 100644 --- a/src/subcommands/diff.rs +++ b/src/subcommands/diff.rs @@ -33,7 +33,7 @@ pub fn diff( let diff_path = match grep_cli::resolve_binary(PathBuf::from(diff_bin)) { Ok(path) => path, Err(err) => { - eprintln!("Failed to resolve command '{}': {}", diff_bin, err); + eprintln!("Failed to resolve command '{diff_bin}': {err}"); return config.error_exit_code; } }; @@ -45,7 +45,7 @@ pub fn diff( .spawn(); if let Err(err) = diff_process { - eprintln!("Failed to execute the command '{}': {}", diff_bin, err); + eprintln!("Failed to execute the command '{diff_bin}': {err}"); return config.error_exit_code; } let mut diff_process = diff_process.unwrap(); @@ -58,7 +58,7 @@ pub fn diff( match error.kind() { ErrorKind::BrokenPipe => return 0, _ => { - eprintln!("{}", error); + eprintln!("{error}"); return config.error_exit_code; } } @@ -70,18 +70,18 @@ pub fn diff( diff_process .wait() .unwrap_or_else(|_| { - delta_unreachable(&format!("'{}' process not running.", diff_bin)); + delta_unreachable(&format!("'{diff_bin}' process not running.")); }) .code() .unwrap_or_else(|| { - eprintln!("'{}' process terminated without exit status.", diff_bin); + eprintln!("'{diff_bin}' process terminated without exit status."); config.error_exit_code }) } #[cfg(test)] mod main_tests { - use std::io::{Cursor, Read, Seek, SeekFrom}; + use std::io::{Cursor, Read, Seek}; use std::path::PathBuf; use super::diff; @@ -125,7 +125,7 @@ mod main_tests { fn _read_to_string(cursor: &mut Cursor<Vec<u8>>) -> String { let mut s = String::new(); - cursor.seek(SeekFrom::Start(0)).unwrap(); + cursor.rewind().unwrap(); cursor.read_to_string(&mut s).unwrap(); s } |