From 8261d790f4b7ae6298d6ff43a24395f6d5f66b92 Mon Sep 17 00:00:00 2001 From: Daniel Hofstetter Date: Fri, 27 Jun 2025 10:45:40 +0200 Subject: [PATCH 1/3] clippy: fix warnings from uninlined_format_args --- src/cmp.rs | 16 ++++++---------- src/main.rs | 2 +- src/params.rs | 2 +- src/side_diff.rs | 5 +---- 4 files changed, 9 insertions(+), 16 deletions(-) diff --git a/src/cmp.rs b/src/cmp.rs index c0fc397..876c3ca 100644 --- a/src/cmp.rs +++ b/src/cmp.rs @@ -35,7 +35,7 @@ pub struct Params { #[inline] fn usage_string(executable: &str) -> String { - format!("Usage: {} ", executable) + format!("Usage: {executable} ") } #[cfg(not(target_os = "windows"))] @@ -75,8 +75,7 @@ pub fn parse_params>(mut opts: Peekable) -> Resu Err(e) if *e.kind() == std::num::IntErrorKind::PosOverflow => usize::MAX, Err(_) => { return Err(format!( - "{}: invalid --ignore-initial value '{}'", - executable_str, skip_desc + "{executable_str}: invalid --ignore-initial value '{skip_desc}'" )) } }; @@ -103,8 +102,7 @@ pub fn parse_params>(mut opts: Peekable) -> Resu "Y" => usize::MAX, // 1_208_925_819_614_629_174_706_176, _ => { return Err(format!( - "{}: invalid --ignore-initial value '{}'", - executable_str, skip_desc + "{executable_str}: invalid --ignore-initial value '{skip_desc}'" )); } }; @@ -170,8 +168,7 @@ pub fn parse_params>(mut opts: Peekable) -> Resu Err(e) if *e.kind() == std::num::IntErrorKind::PosOverflow => usize::MAX, Err(_) => { return Err(format!( - "{}: invalid --bytes value '{}'", - executable_str, max_bytes + "{executable_str}: invalid --bytes value '{max_bytes}'" )) } }; @@ -210,7 +207,7 @@ pub fn parse_params>(mut opts: Peekable) -> Resu std::process::exit(0); } if param_str.starts_with('-') { - return Err(format!("Unknown option: {:?}", param)); + return Err(format!("Unknown option: {param:?}")); } if from.is_none() { from = Some(param); @@ -236,8 +233,7 @@ pub fn parse_params>(mut opts: Peekable) -> Resu if params.quiet && params.verbose { return Err(format!( - "{}: options -l and -s are incompatible", - executable_str + "{executable_str}: options -l and -s are incompatible" )); } diff --git a/src/main.rs b/src/main.rs index badaaa0..b7c2712 100644 --- a/src/main.rs +++ b/src/main.rs @@ -73,7 +73,7 @@ fn main() -> ExitCode { Some("diff") => diff::main(args), Some("cmp") => cmp::main(args), Some(name) => { - eprintln!("{}: utility not supported", name); + eprintln!("{name}: utility not supported"); ExitCode::from(2) } None => second_arg_error(exe_name), diff --git a/src/params.rs b/src/params.rs index c64b3fc..b8483b7 100644 --- a/src/params.rs +++ b/src/params.rs @@ -195,7 +195,7 @@ pub fn parse_params>(mut opts: Peekable) -> Resu Err(error) => return Err(error), } if param.to_string_lossy().starts_with('-') { - return Err(format!("Unknown option: {:?}", param)); + return Err(format!("Unknown option: {param:?}")); } if from.is_none() { from = Some(param); diff --git a/src/side_diff.rs b/src/side_diff.rs index 72673d4..bb22002 100644 --- a/src/side_diff.rs +++ b/src/side_diff.rs @@ -950,10 +950,7 @@ mod tests { push_output(left_ln, right_ln, symbol, &mut buf, &config).unwrap(); let expected_left = format!("áéíóú\t\t\t\t\t\t\t\t"); let expected_right = "😀😃😄"; - assert_eq!( - buf, - format!("{}{}\n", expected_left, expected_right).as_bytes() - ); + assert_eq!(buf, format!("{expected_left}{expected_right}\n").as_bytes()); } } From 03fe6140873498ac24d4ddaca03813a9a2592973 Mon Sep 17 00:00:00 2001 From: Daniel Hofstetter Date: Fri, 27 Jun 2025 10:50:06 +0200 Subject: [PATCH 2/3] clippy: fix warnings from useless_format lint --- src/side_diff.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/side_diff.rs b/src/side_diff.rs index bb22002..45bd325 100644 --- a/src/side_diff.rs +++ b/src/side_diff.rs @@ -901,7 +901,7 @@ mod tests { let symbol = b'<'; // impossible case, just to use different symbol let mut buf = vec![]; push_output(left_ln, right_ln, symbol, &mut buf, &config).unwrap(); - assert_eq!(buf, format!("data\t\t\t\t\t\t\t <\n").as_bytes()); + assert_eq!(buf, "data\t\t\t\t\t\t\t <\n".as_bytes()); } #[test] @@ -948,7 +948,7 @@ mod tests { let symbol = b' '; let mut buf = vec![]; push_output(left_ln, right_ln, symbol, &mut buf, &config).unwrap(); - let expected_left = format!("áéíóú\t\t\t\t\t\t\t\t"); + let expected_left = "áéíóú\t\t\t\t\t\t\t\t"; let expected_right = "😀😃😄"; assert_eq!(buf, format!("{expected_left}{expected_right}\n").as_bytes()); } From 7df02399ba5af0e2b944112a224d8e2d69462006 Mon Sep 17 00:00:00 2001 From: Daniel Hofstetter Date: Fri, 27 Jun 2025 10:52:37 +0200 Subject: [PATCH 3/3] clippy: fix warning from ptr_arg lint --- src/side_diff.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/side_diff.rs b/src/side_diff.rs index 45bd325..56953d2 100644 --- a/src/side_diff.rs +++ b/src/side_diff.rs @@ -973,7 +973,7 @@ mod tests { } } - fn contains_string(vec: &Vec, s: &str) -> usize { + fn contains_string(vec: &[u8], s: &str) -> usize { let pattern = s.as_bytes(); vec.windows(pattern.len()).filter(|s| s == &pattern).count() }