chore: fix clippy 1.88 errors (#783)

Fixed clippy 1.88

Author: StackOverflowExcept1on

cargo-insta/src/cli.rs

@@ -278,7 +278,7 @@ fn query_snapshot(
         println!(
             "{}{}{} {}@{}:",
             style("Reviewing [").bold(),
-            style(format!("{}/{}", i, n)).yellow().bold(),
+            style(format!("{i}/{n}")).yellow().bold(),
             style("]").bold(),
             pkg.name.as_str(),
             &pkg.version,
@@ -449,12 +449,9 @@ fn handle_target_args<'a>(
         (None, None) => {}
     };
 
-    let metadata = cmd.exec().map_err(|e| {
-        format!(
-            "failed to load cargo metadata: {}. Command details: {:?}",
-            e, cmd
-        )
-    })?;
+    let metadata = cmd
+        .exec()
+        .map_err(|e| format!("failed to load cargo metadata: {e}. Command details: {cmd:?}"))?;
     let workspace_root = metadata.workspace_root.as_std_path().to_path_buf();
     let tool_config = ToolConfig::from_workspace(&workspace_root)?;
 
@@ -501,7 +498,7 @@ fn handle_target_args<'a>(
         .iter()
         .map(|x| {
             if let Some(no_period) = x.strip_prefix(".") {
-                eprintln!("`{}` supplied as an extension. This will use `foo.{}` as file names; likely you want `{}` instead.", x, x, no_period)
+                eprintln!("`{x}` supplied as an extension. This will use `foo.{x}` as file names; likely you want `{no_period}` instead.")
             };
             x.as_str()
         })
@@ -656,19 +653,19 @@ fn review_snapshots(
         if !accepted.is_empty() {
             println!("{}:", style("accepted").green());
             for item in accepted {
-                println!("  {}", item);
+                println!("  {item}");
             }
         }
         if !rejected.is_empty() {
             println!("{}:", style("rejected").red());
             for item in rejected {
-                println!("  {}", item);
+                println!("  {item}");
             }
         }
         if !skipped.is_empty() {
             println!("{}:", style("skipped").yellow());
             for item in skipped {
-                println!("  {}", item);
+                println!("  {item}");
             }
         }
     }
@@ -941,7 +938,7 @@ fn handle_unreferenced_snapshots(
                 // load it, since these are in a different format; just delete
                 if path.extension() == Some(std::ffi::OsStr::new("pending-snap")) {
                     if let Err(e) = fs::remove_file(path) {
-                        eprintln!("Failed to remove file: {}", e);
+                        eprintln!("Failed to remove file: {e}");
                     }
                 } else {
                     let snapshot = match Snapshot::from_file(&path) {
@@ -1156,7 +1153,7 @@ fn prepare_test_runner<'snapshot_ref>(
     if matches!(color, ColorWhen::Auto)
         && matches!(test_runner, TestRunner::CargoTest | TestRunner::Auto)
     {
-        proc.arg(format!("--color={}", color));
+        proc.arg(format!("--color={color}"));
     };
     Ok((proc, snapshot_ref_file, prevents_doc_run))
 }
@@ -1273,7 +1270,7 @@ fn show_undiscovered_hint(
                 let fname = x.file_name().to_string_lossy();
                 extensions
                     .iter()
-                    .any(|ext| fname.ends_with(&format!(".{}.new", ext)))
+                    .any(|ext| fname.ends_with(&format!(".{ext}.new")))
                     || fname.ends_with(".pending-snap")
             })
             .map(|x| x.path().to_path_buf())

cargo-insta/src/container.rs

@@ -33,13 +33,13 @@ impl PendingSnapshot {
         use std::fmt::Write;
         let mut rv = String::new();
         if let Some(source) = self.new.metadata().source() {
-            write!(&mut rv, "{}", source).unwrap();
+            write!(&mut rv, "{source}").unwrap();
         }
         if let Some(line) = self.line {
-            write!(&mut rv, ":{}", line).unwrap();
+            write!(&mut rv, ":{line}").unwrap();
         }
         if let Some(name) = self.new.snapshot_name() {
-            write!(&mut rv, " ({})", name).unwrap();
+            write!(&mut rv, " ({name})").unwrap();
         }
         rv
     }
@@ -173,8 +173,7 @@ impl SnapshotContainer {
         let try_removing_snapshot = |p: &Path| {
             fs::remove_file(p).unwrap_or_else(|_| {
                     eprintln!(
-                        "Pending snapshot file at {:?} couldn't be removed. It was likely removed by another process.",
-                        p
+                        "Pending snapshot file at {p:?} couldn't be removed. It was likely removed by another process."
                     );
                 });
         };

cargo-insta/src/inline.rs

@@ -56,7 +56,7 @@ impl FilePatcher {
             .tempfile_in(self.filename.parent().ok_or("Parent directory not found")?)?;
 
         for line in &self.lines {
-            writeln!(temp_file, "{}", line)?;
+            writeln!(temp_file, "{line}")?;
         }
 
         temp_file.flush()?;

cargo-insta/src/walk.rs

@@ -76,7 +76,7 @@ pub(crate) fn make_snapshot_walker(
 
     extensions
         .iter()
-        .flat_map(|ext| [format!("*.{}", ext), format!("*.{}.new", ext)])
+        .flat_map(|ext| [format!("*.{ext}"), format!("*.{ext}.new")])
         .chain(std::iter::once("*.pending-snap".to_string()))
         .for_each(|pattern| {
             override_builder.add(&pattern).unwrap();

cargo-insta/tests/functional/main.rs

@@ -126,7 +126,7 @@ impl TestFiles {
             format!(
                 r#"
 [package]
-name = "{}"
+name = "{name}"
 version = "0.1.0"
 edition = "2021"
 
@@ -135,8 +135,7 @@ doctest = false
 
 [dependencies]
 insta = {{ path = '$PROJECT_PATH' }}
-"#,
-                name
+"#
             ),
         )
     }
@@ -258,8 +257,8 @@ impl TestProject {
             &updated_content,
             3,
             Some((
-                &format!("Original: {}", file_path),
-                &format!("Updated: {}", file_path),
+                &format!("Original: {file_path}"),
+                &format!("Updated: {file_path}"),
             )),
         )
     }
@@ -308,14 +307,13 @@ fn test_force_update_snapshots() {
                 format!(
                     r#"
 [package]
-name = "test_force_update_{}"
+name = "test_force_update_{name}"
 version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-insta = {}
-"#,
-                    name, insta_dependency
+insta = {insta_dependency}
+"#
                 )
                 .to_string(),
             )
@@ -330,10 +328,7 @@ fn test_snapshot_with_newline() {
                 .to_string(),
             )
             .add_file(
-                format!(
-                    "src/snapshots/test_force_update_{}__force_update.snap",
-                    name
-                ),
+                format!("src/snapshots/test_force_update_{name}__force_update.snap"),
                 r#"
 ---
 source: src/lib.rs

cargo-insta/tests/functional/test_workspace_source_path.rs

@@ -81,8 +81,7 @@ fn test_something() {
     // The source path should be relative and start with ../ (since workspace and project are siblings)
     assert!(
         source_path.starts_with("../"),
-        "Source path should be relative starting with '../', but got: {}",
-        source_path
+        "Source path should be relative starting with '../', but got: {source_path}"
     );
 
     // The path should be exactly ../project1/src/lib.rs
@@ -201,12 +200,10 @@ fn test_app2() {
     // Both should have relative paths
     assert!(
         snapshot1_content.contains("source: \"../../projects/app1/src/lib.rs\""),
-        "App1 snapshot source is not the expected relative path. Got:\n{}",
-        snapshot1_content
+        "App1 snapshot source is not the expected relative path. Got:\n{snapshot1_content}"
     );
     assert!(
         snapshot2_content.contains("source: \"../../projects/app2/src/lib.rs\""),
-        "App2 snapshot source is not the expected relative path. Got:\n{}",
-        snapshot2_content
+        "App2 snapshot source is not the expected relative path. Got:\n{snapshot2_content}"
     );
 }

cargo-insta/tests/functional/unreferenced.rs

@@ -306,8 +306,7 @@ Unused snapshot
     let stderr = String::from_utf8_lossy(&output.stderr);
     assert!(
         stderr.contains("encountered unreferenced snapshots"),
-        "Expected error message about unreferenced snapshots, got: {}",
-        stderr
+        "Expected error message about unreferenced snapshots, got: {stderr}"
     );
 
     // Now run without flags - this should also fail due to the config file setting
@@ -328,8 +327,7 @@ Unused snapshot
     let stderr = String::from_utf8_lossy(&output.stderr);
     assert!(
         stderr.contains("encountered unreferenced snapshots"),
-        "Expected error message about unreferenced snapshots, got: {}",
-        stderr
+        "Expected error message about unreferenced snapshots, got: {stderr}"
     );
 
     // Run with --unreferenced=delete to clean up

cargo-insta/tests/functional/workspace.rs

@@ -879,7 +879,7 @@ fn test_in_root() {
     let stderr = String::from_utf8_lossy(&output.stderr);
 
     // There should only be 1 snapshot
-    assert!(stderr.contains("1 snapshot to review"), "\n\n{}", stderr);
+    assert!(stderr.contains("1 snapshot to review"), "\n\n{stderr}");
 }
 
 /// Check that `--manifest` points `cargo-insta` at another path

insta/src/content/json.rs

@@ -7,7 +7,7 @@ use crate::content::Content;
 const COMPACT_MAX_CHARS: usize = 120;
 
 pub fn format_float<T: Display>(value: T) -> String {
-    let mut rv = format!("{}", value);
+    let mut rv = format!("{value}");
     if !rv.contains('.') {
         rv.push_str(".0");
     }
@@ -116,16 +116,16 @@ impl Serializer {
         match value {
             Content::Bool(true) => self.write_str("true"),
             Content::Bool(false) => self.write_str("false"),
-            Content::U8(n) => write!(self.out, "{}", n).unwrap(),
-            Content::U16(n) => write!(self.out, "{}", n).unwrap(),
-            Content::U32(n) => write!(self.out, "{}", n).unwrap(),
-            Content::U64(n) => write!(self.out, "{}", n).unwrap(),
-            Content::U128(n) => write!(self.out, "{}", n).unwrap(),
-            Content::I8(n) => write!(self.out, "{}", n).unwrap(),
-            Content::I16(n) => write!(self.out, "{}", n).unwrap(),
-            Content::I32(n) => write!(self.out, "{}", n).unwrap(),
-            Content::I64(n) => write!(self.out, "{}", n).unwrap(),
-            Content::I128(n) => write!(self.out, "{}", n).unwrap(),
+            Content::U8(n) => write!(self.out, "{n}").unwrap(),
+            Content::U16(n) => write!(self.out, "{n}").unwrap(),
+            Content::U32(n) => write!(self.out, "{n}").unwrap(),
+            Content::U64(n) => write!(self.out, "{n}").unwrap(),
+            Content::U128(n) => write!(self.out, "{n}").unwrap(),
+            Content::I8(n) => write!(self.out, "{n}").unwrap(),
+            Content::I16(n) => write!(self.out, "{n}").unwrap(),
+            Content::I32(n) => write!(self.out, "{n}").unwrap(),
+            Content::I64(n) => write!(self.out, "{n}").unwrap(),
+            Content::I128(n) => write!(self.out, "{n}").unwrap(),
             Content::F32(f) => {
                 if f.is_finite() {
                     self.write_str(&format_float(f));

insta/src/content/yaml/vendored/emitter.rs

@@ -138,7 +138,7 @@ impl<'a> YamlEmitter<'a> {
                 if need_quotes(v) {
                     escape_str(self.writer, v)?;
                 } else {
-                    write!(self.writer, "{}", v)?;
+                    write!(self.writer, "{v}")?;
                 }
                 Ok(())
             }
@@ -151,11 +151,11 @@ impl<'a> YamlEmitter<'a> {
                 Ok(())
             }
             Yaml::Integer(v) => {
-                write!(self.writer, "{}", v)?;
+                write!(self.writer, "{v}")?;
                 Ok(())
             }
             Yaml::Real(ref v) => {
-                write!(self.writer, "{}", v)?;
+                write!(self.writer, "{v}")?;
                 Ok(())
             }
             Yaml::Null | Yaml::BadValue => {
@@ -340,8 +340,8 @@ a4:
             let mut emitter = YamlEmitter::new(&mut writer);
             emitter.dump(doc).unwrap();
         }
-        println!("original:\n{}", s);
-        println!("emitted:\n{}", writer);
+        println!("original:\n{s}");
+        println!("emitted:\n{writer}");
         let docs_new = match YamlLoader::load_from_str(&writer) {
             Ok(y) => y,
             Err(e) => panic!("{}", e),
@@ -431,7 +431,7 @@ z: string with spaces"#;
             emitter.dump(doc).unwrap();
         }
 
-        assert_eq!(s, writer, "actual:\n\n{}\n", writer);
+        assert_eq!(s, writer, "actual:\n\n{writer}\n");
     }
 
     #[test]
@@ -491,8 +491,7 @@ bool1: false"#;
 
         assert_eq!(
             expected, writer,
-            "expected:\n{}\nactual:\n{}\n",
-            expected, writer
+            "expected:\n{expected}\nactual:\n{writer}\n"
         );
     }
 
@@ -535,8 +534,8 @@ a:
             let mut emitter = YamlEmitter::new(&mut writer);
             emitter.dump(doc).unwrap();
         }
-        println!("original:\n{}", s);
-        println!("emitted:\n{}", writer);
+        println!("original:\n{s}");
+        println!("emitted:\n{writer}");
 
         assert_eq!(s, writer);
     }
@@ -559,8 +558,8 @@ a:
             let mut emitter = YamlEmitter::new(&mut writer);
             emitter.dump(doc).unwrap();
         }
-        println!("original:\n{}", s);
-        println!("emitted:\n{}", writer);
+        println!("original:\n{s}");
+        println!("emitted:\n{writer}");
 
         assert_eq!(s, writer);
     }
@@ -581,8 +580,8 @@ a:
             let mut emitter = YamlEmitter::new(&mut writer);
             emitter.dump(doc).unwrap();
         }
-        println!("original:\n{}", s);
-        println!("emitted:\n{}", writer);
+        println!("original:\n{s}");
+        println!("emitted:\n{writer}");
 
         assert_eq!(s, writer);
     }