chore: update & fmt & clippy

src-tauri/src/core/core.rs

@@ -116,12 +116,12 @@ impl CoreManager {
             // 服务模式启动失败就直接运行sidecar
             log::debug!(target: "app", "try to run core in service mode");
 
-            match (|| async {
+            let res = async {
                 service::check_service().await?;
                 service::run_core_by_service(&config_path).await
-            })()
-            .await
-            {
+            }
+            .await;
+            match res {
                 Ok(_) => return Ok(()),
                 Err(err) => {
                     // 修改这个值，免得stop出错

src-tauri/src/core/hotkey.rs

@@ -43,7 +43,7 @@ impl Hotkey {
                     }
                 }
             }
-            *self.current.lock() = hotkeys.clone();
+            self.current.lock().clone_from(hotkeys);
         }
 
         Ok(())
@@ -142,7 +142,7 @@ impl Hotkey {
         });
 
         new_map.iter().for_each(|(&key, &func)| {
-            if old_map.get(key).is_none() {
+            if !old_map.contains_key(key) {
                 add_list.push((key, func));
             }
         });

src-tauri/src/core/manager.rs

@@ -22,7 +22,8 @@ pub fn grant_permission(core: String) -> anyhow::Result<()> {
     #[cfg(target_os = "linux")]
     let output = {
         let path = path.replace(' ', "\\ "); // 避免路径中有空格
-        let shell = format!("setcap cap_net_bind_service,cap_net_admin,cap_dac_override=+ep {path}");
+        let shell =
+            format!("setcap cap_net_bind_service,cap_net_admin,cap_dac_override=+ep {path}");
 
         let sudo = match Command::new("which").arg("pkexec").output() {
             Ok(output) => {

src-tauri/src/core/mod.rs

@@ -1,13 +1,14 @@
 pub mod clash_api;
+#[allow(clippy::module_inception)]
 mod core;
 pub mod handle;
 pub mod hotkey;
 pub mod logger;
 pub mod manager;
+pub mod service;
 pub mod sysopt;
 pub mod timer;
 pub mod tray;
-pub mod service;
 pub mod win_uwp;
 
 pub use self::core::*;

src-tauri/src/core/sysopt.rs

@@ -44,11 +44,12 @@ static DEFAULT_BYPASS: &str =
 fn get_bypass() -> String {
     let bypass = DEFAULT_BYPASS.to_string();
 
-    let custom_bypass = match {
+    let res = {
         let verge = Config::verge();
         let verge = verge.latest();
         verge.system_proxy_bypass.clone()
-    } {
+    };
+    let custom_bypass = match res {
         Some(bypass) => bypass,
         None => "".to_string(),
     };
@@ -65,7 +66,7 @@ fn get_bypass() -> String {
         format!("{},{}", bypass, custom_bypass)
     };
 
-    bypass.into()
+    bypass
 }
 
 impl Sysopt {
@@ -152,19 +153,18 @@ impl Sysopt {
                 verge.proxy_auto_config.unwrap_or(false),
             )
         };
-        if pac {
-            if cur_autoproxy.is_none() || old_autoproxy.is_none() {
-                drop(cur_autoproxy);
-                drop(old_autoproxy);
-                return self.init_sysproxy();
-            }
-        } else {
-            if cur_sysproxy.is_none() || old_sysproxy.is_none() {
-                drop(cur_sysproxy);
-                drop(old_sysproxy);
-                return self.init_sysproxy();
-            }
+        if pac && (cur_autoproxy.is_none() || old_autoproxy.is_none()) {
+            drop(cur_autoproxy);
+            drop(old_autoproxy);
+            return self.init_sysproxy();
         }
+
+        if !pac && (cur_sysproxy.is_none() || old_sysproxy.is_none()) {
+            drop(cur_sysproxy);
+            drop(old_sysproxy);
+            return self.init_sysproxy();
+        }
+
         let port = Config::verge()
             .latest()
             .verge_mixed_port