From f890b535d239f16d5f11a68063f79e212f50c643 Mon Sep 17 00:00:00 2001
From: Hamir Mahal <hamirmahal@gmail.com>
Date: Wed, 16 Oct 2024 09:03:15 -0700
Subject: [PATCH] style: simplify string formatting for readability

---
 build.rs                                 |  4 ++--
 crates/core/flags/complete/powershell.rs |  2 +-
 crates/core/search.rs                    |  5 ++---
 tests/json.rs                            | 10 +++++-----
 tests/util.rs                            |  2 +-
 5 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/build.rs b/build.rs
index db9584bff..4652be464 100644
--- a/build.rs
+++ b/build.rs
@@ -22,7 +22,7 @@ fn set_windows_exe_options() {
     manifest.push(MANIFEST);
     let Some(manifest) = manifest.to_str() else { return };
 
-    println!("cargo:rerun-if-changed={}", MANIFEST);
+    println!("cargo:rerun-if-changed={MANIFEST}");
     // Embed the Windows application manifest file.
     println!("cargo:rustc-link-arg-bin=rg=/MANIFEST:EMBED");
     println!("cargo:rustc-link-arg-bin=rg=/MANIFESTINPUT:{manifest}");
@@ -42,5 +42,5 @@ fn set_git_revision_hash() {
     if rev.is_empty() {
         return;
     }
-    println!("cargo:rustc-env=RIPGREP_BUILD_GIT_HASH={}", rev);
+    println!("cargo:rustc-env=RIPGREP_BUILD_GIT_HASH={rev}");
 }
diff --git a/crates/core/flags/complete/powershell.rs b/crates/core/flags/complete/powershell.rs
index e8a89e2ea..17fd2d496 100644
--- a/crates/core/flags/complete/powershell.rs
+++ b/crates/core/flags/complete/powershell.rs
@@ -72,7 +72,7 @@ pub(crate) fn generate() -> String {
         }
 
         if let Some(negated) = flag.name_negated() {
-            let dash_name = format!("--{}", negated);
+            let dash_name = format!("--{negated}");
             flags.push_str("\n      ");
             flags.push_str(
                 &TEMPLATE_FLAG
diff --git a/crates/core/search.rs b/crates/core/search.rs
index 672734254..d03433f6f 100644
--- a/crates/core/search.rs
+++ b/crates/core/search.rs
@@ -307,15 +307,14 @@ impl<W: WriteColor> SearchWorker<W> {
             io::Error::new(
                 io::ErrorKind::Other,
                 format!(
-                    "preprocessor command could not start: '{:?}': {}",
-                    cmd, err,
+                    "preprocessor command could not start: '{cmd:?}': {err}",
                 ),
             )
         })?;
         let result = self.search_reader(path, &mut rdr).map_err(|err| {
             io::Error::new(
                 io::ErrorKind::Other,
-                format!("preprocessor command failed: '{:?}': {}", cmd, err),
+                format!("preprocessor command failed: '{cmd:?}': {err}"),
             )
         });
         let close_result = rdr.close();
diff --git a/tests/json.rs b/tests/json.rs
index 86d8518a4..d4d5be30c 100644
--- a/tests/json.rs
+++ b/tests/json.rs
@@ -21,35 +21,35 @@ impl Message {
     fn unwrap_begin(&self) -> Begin {
         match *self {
             Message::Begin(ref x) => x.clone(),
-            ref x => panic!("expected Message::Begin but got {:?}", x),
+            ref x => panic!("expected Message::Begin but got {x:?}"),
         }
     }
 
     fn unwrap_end(&self) -> End {
         match *self {
             Message::End(ref x) => x.clone(),
-            ref x => panic!("expected Message::End but got {:?}", x),
+            ref x => panic!("expected Message::End but got {x:?}"),
         }
     }
 
     fn unwrap_match(&self) -> Match {
         match *self {
             Message::Match(ref x) => x.clone(),
-            ref x => panic!("expected Message::Match but got {:?}", x),
+            ref x => panic!("expected Message::Match but got {x:?}"),
         }
     }
 
     fn unwrap_context(&self) -> Context {
         match *self {
             Message::Context(ref x) => x.clone(),
-            ref x => panic!("expected Message::Context but got {:?}", x),
+            ref x => panic!("expected Message::Context but got {x:?}"),
         }
     }
 
     fn unwrap_summary(&self) -> Summary {
         match *self {
             Message::Summary(ref x) => x.clone(),
-            ref x => panic!("expected Message::Summary but got {:?}", x),
+            ref x => panic!("expected Message::Summary but got {x:?}"),
         }
     }
 }
diff --git a/tests/util.rs b/tests/util.rs
index 07a1a783f..a56bb2688 100644
--- a/tests/util.rs
+++ b/tests/util.rs
@@ -75,7 +75,7 @@ impl Dir {
             .expect("executable's directory")
             .to_path_buf();
         let dir =
-            env::temp_dir().join(TEST_DIR).join(name).join(&format!("{}", id));
+            env::temp_dir().join(TEST_DIR).join(name).join(&format!("{id}"));
         if dir.exists() {
             nice_err(&dir, fs::remove_dir_all(&dir));
         }