From 1777406a16be4ece9f923f2f94ad1a4a241effcd Mon Sep 17 00:00:00 2001 From: Tony <68118705+Legend-Master@users.noreply.github.com> Date: Tue, 13 May 2025 14:18:24 +0800 Subject: [PATCH] chore: apply some clippy suggestions (#13424) --- crates/tauri-bundler/src/bundle/updater_bundle.rs | 2 +- crates/tauri-runtime-wry/src/lib.rs | 3 +-- crates/tauri/build.rs | 4 ++-- crates/tauri/src/manager/mod.rs | 2 +- crates/tauri/src/process.rs | 5 +---- 5 files changed, 6 insertions(+), 10 deletions(-) diff --git a/crates/tauri-bundler/src/bundle/updater_bundle.rs b/crates/tauri-bundler/src/bundle/updater_bundle.rs index 1250ac4ca..5687d4942 100644 --- a/crates/tauri-bundler/src/bundle/updater_bundle.rs +++ b/crates/tauri-bundler/src/bundle/updater_bundle.rs @@ -193,7 +193,7 @@ fn bundle_update_windows(settings: &Settings, bundles: &[Bundle]) -> crate::Resu p.push(c); (p, b) }); - let archived_path = archived_path.with_extension(format!("{}.zip", bundle_name)); + let archived_path = archived_path.with_extension(format!("{bundle_name}.zip")); log::info!(action = "Bundling"; "{}", display_path(&archived_path)); diff --git a/crates/tauri-runtime-wry/src/lib.rs b/crates/tauri-runtime-wry/src/lib.rs index 35cb0eea3..79593eb83 100644 --- a/crates/tauri-runtime-wry/src/lib.rs +++ b/crates/tauri-runtime-wry/src/lib.rs @@ -4858,10 +4858,9 @@ You may have it installed on another user account, but it is not available for t .unwrap(); unsafe { let label_ = label.clone(); - let focused_webview_ = focused_webview.clone(); controller.add_LostFocus( &FocusChangedEventHandler::create(Box::new(move |_, _| { - let mut focused_webview = focused_webview_.lock().unwrap(); + let mut focused_webview = focused_webview.lock().unwrap(); // when using multiwebview mode, we should handle webview focus changes // so we check is the currently focused webview matches this webview's // (in this case, it means we lost the window focus) diff --git a/crates/tauri/build.rs b/crates/tauri/build.rs index 15716de01..a1d3c69b6 100644 --- a/crates/tauri/build.rs +++ b/crates/tauri/build.rs @@ -393,12 +393,12 @@ fn define_permissions( }; let default_toml = format!( - r###"{LICENSE_HEADER}# Automatically generated - DO NOT EDIT! + r#"{LICENSE_HEADER}# Automatically generated - DO NOT EDIT! [default] description = "Default permissions for the plugin{all_enable_by_default}." permissions = [{default_permissions}] -"###, +"#, ); let out_path = autogenerated.join("default.toml"); diff --git a/crates/tauri/src/manager/mod.rs b/crates/tauri/src/manager/mod.rs index acc5b68d0..d3335cb7d 100644 --- a/crates/tauri/src/manager/mod.rs +++ b/crates/tauri/src/manager/mod.rs @@ -276,7 +276,7 @@ impl AppManager { ) -> Self { // generate a random isolation key at runtime #[cfg(feature = "isolation")] - if let Pattern::Isolation { ref mut key, .. } = &mut context.pattern { + if let Pattern::Isolation { key, .. } = &mut context.pattern { *key = uuid::Uuid::new_v4().to_string(); } diff --git a/crates/tauri/src/process.rs b/crates/tauri/src/process.rs index d041500fc..76937b1fe 100644 --- a/crates/tauri/src/process.rs +++ b/crates/tauri/src/process.rs @@ -80,10 +80,7 @@ pub fn restart(env: &Env) -> ! { #[cfg(target_os = "macos")] restart_macos_app(&path, env); - if let Err(e) = Command::new(path) - .args(env.args_os.iter().skip(1).collect::>()) - .spawn() - { + if let Err(e) = Command::new(path).args(env.args_os.iter().skip(1)).spawn() { log::error!("failed to restart app: {e}"); } }