chore: clippy 1.88 (#13720)

Author: FabianLars

bench/src/build_benchmark_jsons.rs

@@ -52,13 +52,13 @@ fn main() {
       .expect("Something wrong with tauri_data"),
     &serde_json::to_value(all_data).expect("Unable to build final json (all)"),
   )
-  .unwrap_or_else(|_| panic!("Unable to write {:?}", tauri_data));
+  .unwrap_or_else(|_| panic!("Unable to write {tauri_data:?}"));
 
   utils::write_json(
     tauri_recent
       .to_str()
       .expect("Something wrong with tauri_recent"),
     &serde_json::to_value(recent).expect("Unable to build final json (recent)"),
   )
-  .unwrap_or_else(|_| panic!("Unable to write {:?}", tauri_recent));
+  .unwrap_or_else(|_| panic!("Unable to write {tauri_recent:?}"));
 }

bench/src/run_benchmark.rs

@@ -89,7 +89,7 @@ fn run_max_mem_benchmark() -> Result<HashMap<String, u64>> {
   let mut results = HashMap::<String, u64>::new();
 
   for (name, example_exe) in get_all_benchmarks() {
-    let benchmark_file = utils::target_dir().join(format!("mprof{}_.dat", name));
+    let benchmark_file = utils::target_dir().join(format!("mprof{name}_.dat"));
     let benchmark_file = benchmark_file.to_str().unwrap();
 
     let proc = Command::new("mprof")
@@ -105,7 +105,7 @@ fn run_max_mem_benchmark() -> Result<HashMap<String, u64>> {
       .spawn()?;
 
     let proc_result = proc.wait_with_output()?;
-    println!("{:?}", proc_result);
+    println!("{proc_result:?}");
     results.insert(
       name.to_string(),
       utils::parse_max_mem(benchmark_file).unwrap(),
@@ -126,11 +126,11 @@ fn rlib_size(target_dir: &std::path::Path, prefix: &str) -> u64 {
     if name.starts_with(prefix) && name.ends_with(".rlib") {
       let start = name.split('-').next().unwrap().to_string();
       if seen.contains(&start) {
-        println!("skip {}", name);
+        println!("skip {name}");
       } else {
         seen.insert(start);
         size += entry.metadata().unwrap().len();
-        println!("check size {} {}", name, size);
+        println!("check size {name} {size}");
       }
     }
   }
@@ -142,7 +142,7 @@ fn get_binary_sizes(target_dir: &Path) -> Result<HashMap<String, u64>> {
   let mut sizes = HashMap::<String, u64>::new();
 
   let wry_size = rlib_size(target_dir, "libwry");
-  println!("wry {} bytes", wry_size);
+  println!("wry {wry_size} bytes");
   sizes.insert("wry_rlib".to_string(), wry_size);
 
   // add size for all EXEC_TIME_BENCHMARKS

bench/src/utils.rs

@@ -96,8 +96,8 @@ pub fn run_collect(cmd: &[&str]) -> (String, String) {
   let stdout = String::from_utf8_lossy(&stdout).to_string();
   let stderr = String::from_utf8_lossy(&stderr).to_string();
   if !status.success() {
-    eprintln!("stdout: <<<{}>>>", stdout);
-    eprintln!("stderr: <<<{}>>>", stderr);
+    eprintln!("stdout: <<<{stdout}>>>");
+    eprintln!("stderr: <<<{stderr}>>>");
     panic!("Unexpected exit code: {:?}", status.code());
   }
   (stdout, stderr)
@@ -230,7 +230,7 @@ pub fn download_file(url: &str, filename: PathBuf) {
 
   // Downloading with curl this saves us from adding
   // a Rust HTTP client dependency.
-  println!("Downloading {}", url);
+  println!("Downloading {url}");
   let status = Command::new("curl")
     .arg("-L")
     .arg("-s")

crates/tauri-bundler/src/bundle/linux/appimage.rs

@@ -27,8 +27,7 @@ pub fn bundle_project(settings: &Settings) -> crate::Result<Vec<PathBuf>> {
     Arch::Armhf => "armhf",
     target => {
       return Err(crate::Error::ArchError(format!(
-        "Unsupported architecture: {:?}",
-        target
+        "Unsupported architecture: {target:?}"
       )));
     }
   };

crates/tauri-bundler/src/bundle/linux/debian.rs

@@ -49,8 +49,7 @@ pub fn bundle_project(settings: &Settings) -> crate::Result<Vec<PathBuf>> {
     Arch::Riscv64 => "riscv64",
     target => {
       return Err(crate::Error::ArchError(format!(
-        "Unsupported architecture: {:?}",
-        target
+        "Unsupported architecture: {target:?}"
       )));
     }
   };
@@ -164,7 +163,7 @@ fn generate_control_file(
   let dest_path = control_dir.join("control");
   let mut file = fs_utils::create_file(&dest_path)?;
   let package = heck::AsKebabCase(settings.product_name());
-  writeln!(file, "Package: {}", package)?;
+  writeln!(file, "Package: {package}")?;
   writeln!(file, "Version: {}", settings.version_string())?;
   writeln!(file, "Architecture: {arch}")?;
   // Installed-Size must be divided by 1024, see https://www.debian.org/doc/debian-policy/ch-controlfields.html#installed-size
@@ -183,16 +182,16 @@ fn generate_control_file(
 
   writeln!(file, "Maintainer: {authors}")?;
   if let Some(section) = &settings.deb().section {
-    writeln!(file, "Section: {}", section)?;
+    writeln!(file, "Section: {section}")?;
   }
   if let Some(priority) = &settings.deb().priority {
-    writeln!(file, "Priority: {}", priority)?;
+    writeln!(file, "Priority: {priority}")?;
   } else {
     writeln!(file, "Priority: optional")?;
   }
 
   if let Some(homepage) = settings.homepage_url() {
-    writeln!(file, "Homepage: {}", homepage)?;
+    writeln!(file, "Homepage: {homepage}")?;
   }
 
   let dependencies = settings.deb().depends.as_ref().cloned().unwrap_or_default();

crates/tauri-bundler/src/bundle/linux/rpm.rs

@@ -32,8 +32,7 @@ pub fn bundle_project(settings: &Settings) -> crate::Result<Vec<PathBuf>> {
     Arch::Riscv64 => "riscv64",
     target => {
       return Err(crate::Error::ArchError(format!(
-        "Unsupported architecture: {:?}",
-        target
+        "Unsupported architecture: {target:?}"
       )));
     }
   };

crates/tauri-bundler/src/bundle/macos/app.rs

@@ -65,15 +65,11 @@ pub fn bundle_project(settings: &Settings) -> crate::Result<Vec<PathBuf>> {
 
   if app_bundle_path.exists() {
     fs::remove_dir_all(&app_bundle_path)
-      .with_context(|| format!("Failed to remove old {}", app_product_name))?;
+      .with_context(|| format!("Failed to remove old {app_product_name}"))?;
   }
   let bundle_directory = app_bundle_path.join("Contents");
-  fs::create_dir_all(&bundle_directory).with_context(|| {
-    format!(
-      "Failed to create bundle directory at {:?}",
-      bundle_directory
-    )
-  })?;
+  fs::create_dir_all(&bundle_directory)
+    .with_context(|| format!("Failed to create bundle directory at {bundle_directory:?}"))?;
 
   let resources_dir = bundle_directory.join("Resources");
   let bin_dir = bundle_directory.join("MacOS");
@@ -160,7 +156,7 @@ fn copy_binaries_to_bundle(
     let bin_path = settings.binary_path(bin);
     let dest_path = dest_dir.join(bin.name());
     fs_utils::copy_file(&bin_path, &dest_path)
-      .with_context(|| format!("Failed to copy binary from {:?}", bin_path))?;
+      .with_context(|| format!("Failed to copy binary from {bin_path:?}"))?;
     paths.push(dest_path);
   }
   Ok(paths)
@@ -176,10 +172,10 @@ fn copy_custom_files_to_bundle(bundle_directory: &Path, settings: &Settings) ->
     };
     if path.is_file() {
       fs_utils::copy_file(path, &bundle_directory.join(contents_path))
-        .with_context(|| format!("Failed to copy file {:?} to {:?}", path, contents_path))?;
+        .with_context(|| format!("Failed to copy file {path:?} to {contents_path:?}"))?;
     } else {
       fs_utils::copy_dir(path, &bundle_directory.join(contents_path))
-        .with_context(|| format!("Failed to copy directory {:?} to {:?}", path, contents_path))?;
+        .with_context(|| format!("Failed to copy directory {path:?} to {contents_path:?}"))?;
     }
   }
   Ok(())
@@ -359,7 +355,7 @@ fn create_info_plist(
 
 // Copies the framework under `{src_dir}/{framework}.framework` to `{dest_dir}/{framework}.framework`.
 fn copy_framework_from(dest_dir: &Path, framework: &str, src_dir: &Path) -> crate::Result<bool> {
-  let src_name = format!("{}.framework", framework);
+  let src_name = format!("{framework}.framework");
   let src_path = src_dir.join(&src_name);
   if src_path.exists() {
     fs_utils::copy_dir(&src_path, &dest_dir.join(&src_name))?;
@@ -387,7 +383,7 @@ fn copy_frameworks_to_bundle(
   }
   let dest_dir = bundle_directory.join("Frameworks");
   fs::create_dir_all(bundle_directory)
-    .with_context(|| format!("Failed to create Frameworks directory at {:?}", dest_dir))?;
+    .with_context(|| format!("Failed to create Frameworks directory at {dest_dir:?}"))?;
   for framework in frameworks.iter() {
     if framework.ends_with(".framework") {
       let src_path = PathBuf::from(framework);
@@ -402,8 +398,7 @@ fn copy_frameworks_to_bundle(
       let src_path = PathBuf::from(framework);
       if !src_path.exists() {
         return Err(crate::Error::GenericError(format!(
-          "Library not found: {}",
-          framework
+          "Library not found: {framework}"
         )));
       }
       let src_name = src_path.file_name().expect("Couldn't get library filename");
@@ -416,8 +411,7 @@ fn copy_frameworks_to_bundle(
       continue;
     } else if framework.contains('/') {
       return Err(crate::Error::GenericError(format!(
-        "Framework path should have .framework extension: {}",
-        framework
+        "Framework path should have .framework extension: {framework}"
       )));
     }
     if let Some(home_dir) = dirs::home_dir() {
@@ -435,8 +429,7 @@ fn copy_frameworks_to_bundle(
       continue;
     }
     return Err(crate::Error::GenericError(format!(
-      "Could not locate framework: {}",
-      framework
+      "Could not locate framework: {framework}"
     )));
   }
   Ok(paths)

crates/tauri-bundler/src/bundle/macos/dmg/mod.rs

@@ -49,8 +49,7 @@ pub fn bundle_project(settings: &Settings, bundles: &[Bundle]) -> crate::Result<
       Arch::Universal => "universal",
       target => {
         return Err(crate::Error::ArchError(format!(
-          "Unsupported architecture: {:?}",
-          target
+          "Unsupported architecture: {target:?}"
         )));
       }
     }
@@ -59,7 +58,7 @@ pub fn bundle_project(settings: &Settings, bundles: &[Bundle]) -> crate::Result<
   let dmg_path = output_path.join(&dmg_name);
 
   let product_name = settings.product_name();
-  let bundle_file_name = format!("{}.app", product_name);
+  let bundle_file_name = format!("{product_name}.app");
   let bundle_dir = settings.project_out_directory().join("bundle/macos");
 
   let support_directory_path = output_path
@@ -69,10 +68,10 @@ pub fn bundle_project(settings: &Settings, bundles: &[Bundle]) -> crate::Result<
 
   for path in &[&support_directory_path, &output_path] {
     if path.exists() {
-      fs::remove_dir_all(path).with_context(|| format!("Failed to remove old {}", dmg_name))?;
+      fs::remove_dir_all(path).with_context(|| format!("Failed to remove old {dmg_name}"))?;
     }
     fs::create_dir_all(path)
-      .with_context(|| format!("Failed to create output directory at {:?}", path))?;
+      .with_context(|| format!("Failed to create output directory at {path:?}"))?;
   }
 
   // create paths for script

crates/tauri-bundler/src/bundle/macos/ios.rs

@@ -45,16 +45,16 @@ pub fn bundle_project(settings: &Settings) -> crate::Result<Vec<PathBuf>> {
 
   if app_bundle_path.exists() {
     fs::remove_dir_all(&app_bundle_path)
-      .with_context(|| format!("Failed to remove old {}", app_product_name))?;
+      .with_context(|| format!("Failed to remove old {app_product_name}"))?;
   }
   fs::create_dir_all(&app_bundle_path)
-    .with_context(|| format!("Failed to create bundle directory at {:?}", app_bundle_path))?;
+    .with_context(|| format!("Failed to create bundle directory at {app_bundle_path:?}"))?;
 
   for src in settings.resource_files() {
     let src = src?;
     let dest = app_bundle_path.join(tauri_utils::resources::resource_relpath(&src));
     fs_utils::copy_file(&src, &dest)
-      .with_context(|| format!("Failed to copy resource file {:?}", src))?;
+      .with_context(|| format!("Failed to copy resource file {src:?}"))?;
   }
 
   let icon_filenames = generate_icon_files(&app_bundle_path, settings)
@@ -65,7 +65,7 @@ pub fn bundle_project(settings: &Settings) -> crate::Result<Vec<PathBuf>> {
   for bin in settings.binaries() {
     let bin_path = settings.binary_path(bin);
     fs_utils::copy_file(&bin_path, &app_bundle_path.join(bin.name()))
-      .with_context(|| format!("Failed to copy binary from {:?}", bin_path))?;
+      .with_context(|| format!("Failed to copy binary from {bin_path:?}"))?;
   }
 
   Ok(vec![app_bundle_path])
@@ -197,7 +197,7 @@ fn generate_info_plist(
   if !icon_filenames.is_empty() {
     writeln!(file, "  <key>CFBundleIconFiles</key>\n  <array>")?;
     for filename in icon_filenames {
-      writeln!(file, "    <string>{}</string>", filename)?;
+      writeln!(file, "    <string>{filename}</string>")?;
     }
     writeln!(file, "  </array>")?;
   }

crates/tauri-bundler/src/bundle/windows/msi/mod.rs

@@ -177,7 +177,7 @@ impl ResourceDirectory {
       directories.push_str(wix_string.as_str());
     }
     let wix_string = if self.name.is_empty() {
-      format!("{}{}", files, directories)
+      format!("{files}{directories}")
     } else {
       format!(
         r#"<Directory Id="I{id}" Name="{name}">{files}{directories}</Directory>"#,
@@ -221,8 +221,7 @@ fn app_installer_output_path(
     Arch::AArch64 => "arm64",
     target => {
       return Err(crate::Error::ArchError(format!(
-        "Unsupported architecture: {:?}",
-        target
+        "Unsupported architecture: {target:?}"
       )))
     }
   };
@@ -352,8 +351,7 @@ fn run_candle(
     Arch::AArch64 => "arm64",
     target => {
       return Err(crate::Error::ArchError(format!(
-        "unsupported architecture: {:?}",
-        target
+        "unsupported architecture: {target:?}"
       )))
     }
   };
@@ -443,8 +441,7 @@ pub fn build_wix_app_installer(
     Arch::AArch64 => "arm64",
     target => {
       return Err(crate::Error::ArchError(format!(
-        "unsupported architecture: {:?}",
-        target
+        "unsupported architecture: {target:?}"
       )))
     }
   };
@@ -845,7 +842,7 @@ pub fn build_wix_app_installer(
 
     let locale_contents = locale_contents.replace(
       "</WixLocalization>",
-      &format!("{}</WixLocalization>", unset_locale_strings),
+      &format!("{unset_locale_strings}</WixLocalization>"),
     );
     let locale_path = output_path.join("locale.wxl");
     {