From ef7b5eeba59a9edf187bb5026f827f0097d93adb Mon Sep 17 00:00:00 2001
From: Andrew <andrew@digerati.co.nz>
Date: Fri, 25 Apr 2025 08:27:17 +1200
Subject: [PATCH] Fix new clippy lints

---
 src/headers.rs |  2 +-
 src/lib.rs     | 18 +++++++-----------
 src/main.rs    |  2 +-
 3 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/src/headers.rs b/src/headers.rs
index 2bfbda11..21786d4d 100644
--- a/src/headers.rs
+++ b/src/headers.rs
@@ -269,7 +269,7 @@ pub fn extract_icc(iccp: &Chunk) -> Option<Vec<u8>> {
         Ok(icc) => Some(icc),
         Err(e) => {
             // Log the error so we can know if the buffer size needs to be adjusted
-            warn!("Failed to decompress icc: {}", e);
+            warn!("Failed to decompress icc: {e}");
             None
         }
     }
diff --git a/src/lib.rs b/src/lib.rs
index cd5d39d7..c3d6dba0 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -183,7 +183,7 @@ impl RawImage {
 /// Perform optimization on the input file using the options provided
 pub fn optimize(input: &InFile, output: &OutFile, opts: &Options) -> PngResult<()> {
     // Read in the file and try to decode as PNG.
-    info!("Processing: {}", input);
+    info!("Processing: {input}");
 
     let deadline = Arc::new(Deadline::new(opts.timeout));
 
@@ -207,7 +207,7 @@ pub fn optimize(input: &InFile, output: &OutFile, opts: &Options) -> PngResult<(
                         ))
                     })
                     .map(Some)?;
-                trace!("preserving metadata: {:?}", opt_metadata_preserved);
+                trace!("preserving metadata: {opt_metadata_preserved:?}");
             } else {
                 opt_metadata_preserved = None;
             }
@@ -236,7 +236,7 @@ pub fn optimize(input: &InFile, output: &OutFile, opts: &Options) -> PngResult<(
             (OutFile::Path { path, .. }, InFile::Path(ref input_path))
                 if path.as_ref().map_or(true, |p| p == input_path) =>
             {
-                info!("{}: Could not optimize further, no change written", input);
+                info!("{input}: Could not optimize further, no change written");
                 return Ok(());
             }
             _ => {
@@ -261,7 +261,7 @@ pub fn optimize(input: &InFile, output: &OutFile, opts: &Options) -> PngResult<(
 
     match (output, input) {
         (OutFile::None, _) => {
-            info!("{}: Running in pretend mode, no output", savings);
+            info!("{savings}: Running in pretend mode, no output");
         }
         (&OutFile::StdOut, _) | (&OutFile::Path { path: None, .. }, &InFile::StdIn) => {
             let mut buffer = BufWriter::new(stdout());
@@ -346,8 +346,8 @@ fn optimize_png(
         raw.ihdr.width, raw.ihdr.height
     );
     report_format("    ", &raw);
-    debug!("    IDAT size = {} bytes", idat_original_size);
-    debug!("    File size = {} bytes", file_original_size);
+    debug!("    IDAT size = {idat_original_size} bytes");
+    debug!("    File size = {file_original_size} bytes");
 
     let mut opts = opts.to_owned();
     preprocess_chunks(&mut png.aux_chunks, &mut opts);
@@ -681,11 +681,7 @@ fn copy_times(_: &Metadata, _: &Path) -> PngResult<()> {
 fn copy_times(input_path_meta: &Metadata, out_path: &Path) -> PngResult<()> {
     let atime = filetime::FileTime::from_last_access_time(input_path_meta);
     let mtime = filetime::FileTime::from_last_modification_time(input_path_meta);
-    trace!(
-        "attempting to set file times: atime: {:?}, mtime: {:?}",
-        atime,
-        mtime
-    );
+    trace!("attempting to set file times: atime: {atime:?}, mtime: {mtime:?}");
     filetime::set_file_times(out_path, atime, mtime).map_err(|err_io| {
         PngError::new(&format!(
             "unable to set file times on {out_path:?}: {err_io}"
diff --git a/src/main.rs b/src/main.rs
index 91b57126..52623a7d 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -47,7 +47,7 @@ fn main() -> ExitCode {
     let (out_file, out_dir, opts) = match parse_opts_into_struct(&matches) {
         Ok(x) => x,
         Err(x) => {
-            error!("{}", x);
+            error!("{x}");
             return ExitCode::FAILURE;
         }
     };