diff --git a/src-tauri/.clippy.toml b/.clippy.toml similarity index 100% rename from src-tauri/.clippy.toml rename to .clippy.toml diff --git a/crates/clash-verge-draft/bench/benche_me.rs b/crates/clash-verge-draft/bench/benche_me.rs index 792618ad9..1f7daa165 100644 --- a/crates/clash-verge-draft/bench/benche_me.rs +++ b/crates/clash-verge-draft/bench/benche_me.rs @@ -104,8 +104,7 @@ pub fn bench_draft(c: &mut Criterion) { let draft = black_box(make_draft()); let _: Result<(), anyhow::Error> = draft .with_data_modify::<_, _, _>(|mut box_data| async move { - box_data.enable_auto_launch = - Some(!box_data.enable_auto_launch.unwrap_or(false)); + box_data.enable_auto_launch = Some(!box_data.enable_auto_launch.unwrap_or(false)); Ok((box_data, ())) }) .await; diff --git a/crates/clash-verge-draft/tests/test_me.rs b/crates/clash-verge-draft/tests/test_me.rs index 9e214d163..3221f1af6 100644 --- a/crates/clash-verge-draft/tests/test_me.rs +++ b/crates/clash-verge-draft/tests/test_me.rs @@ -133,10 +133,7 @@ mod tests { let prev_draft_ptr = std::sync::Arc::as_ptr(&draft_after_first_edit); draft.apply(); let committed_after_apply = draft.data_arc(); - assert_eq!( - std::sync::Arc::as_ptr(&committed_after_apply), - prev_draft_ptr - ); + assert_eq!(std::sync::Arc::as_ptr(&committed_after_apply), prev_draft_ptr); // 第二次编辑：此时草稿唯一持有（无其它引用），不应再克隆 // 获取草稿 Arc 的指针并立即丢弃本地引用，避免增加 strong_count diff --git a/crates/clash-verge-logging/src/lib.rs b/crates/clash-verge-logging/src/lib.rs index a30c15ee7..8b044ee4d 100644 --- a/crates/clash-verge-logging/src/lib.rs +++ b/crates/clash-verge-logging/src/lib.rs @@ -93,11 +93,7 @@ pub fn write_sidecar_log( ) { let args = format_args!("{}", message); - let record = Record::builder() - .args(args) - .level(level) - .target("sidecar") - .build(); + let record = Record::builder().args(args).level(level).target("sidecar").build(); let _ = writer.write(now, &record); } @@ -111,9 +107,7 @@ impl<'a> NoModuleFilter<'a> { pub fn filter(&self, record: &Record) -> bool { if let Some(module) = record.module_path() { for blocked in self.0 { - if module.len() >= blocked.len() - && module.as_bytes()[..blocked.len()] == blocked.as_bytes()[..] - { + if module.len() >= blocked.len() && module.as_bytes()[..blocked.len()] == blocked.as_bytes()[..] { return false; } } diff --git a/crates/clash-verge-signal/src/unix.rs b/crates/clash-verge-signal/src/unix.rs index aa81393bb..dfb361936 100644 --- a/crates/clash-verge-signal/src/unix.rs +++ b/crates/clash-verge-signal/src/unix.rs @@ -17,36 +17,21 @@ where let mut sigterm = match signal(SignalKind::terminate()) { Ok(s) => s, Err(e) => { - logging!( - error, - Type::SystemSignal, - "Failed to register SIGTERM: {}", - e - ); + logging!(error, Type::SystemSignal, "Failed to register SIGTERM: {}", e); return; } }; let mut sigint = match signal(SignalKind::interrupt()) { Ok(s) => s, Err(e) => { - logging!( - error, - Type::SystemSignal, - "Failed to register SIGINT: {}", - e - ); + logging!(error, Type::SystemSignal, "Failed to register SIGINT: {}", e); return; } }; let mut sighup = match signal(SignalKind::hangup()) { Ok(s) => s, Err(e) => { - logging!( - error, - Type::SystemSignal, - "Failed to register SIGHUP: {}", - e - ); + logging!(error, Type::SystemSignal, "Failed to register SIGHUP: {}", e); return; } }; diff --git a/crates/clash-verge-signal/src/windows.rs b/crates/clash-verge-signal/src/windows.rs index cf64912c8..d4f80400c 100644 --- a/crates/clash-verge-signal/src/windows.rs +++ b/crates/clash-verge-signal/src/windows.rs @@ -17,12 +17,7 @@ where let mut ctrl_c = match windows::ctrl_c() { Ok(s) => s, Err(e) => { - logging!( - error, - Type::SystemSignal, - "Failed to register Ctrl+C: {}", - e - ); + logging!(error, Type::SystemSignal, "Failed to register Ctrl+C: {}", e); return; } }; @@ -30,12 +25,7 @@ where let mut ctrl_close = match windows::ctrl_close() { Ok(s) => s, Err(e) => { - logging!( - error, - Type::SystemSignal, - "Failed to register Ctrl+Close: {}", - e - ); + logging!(error, Type::SystemSignal, "Failed to register Ctrl+Close: {}", e); return; } }; @@ -43,12 +33,7 @@ where let mut ctrl_shutdown = match windows::ctrl_shutdown() { Ok(s) => s, Err(e) => { - logging!( - error, - Type::SystemSignal, - "Failed to register Ctrl+Shutdown: {}", - e - ); + logging!(error, Type::SystemSignal, "Failed to register Ctrl+Shutdown: {}", e); return; } }; @@ -56,12 +41,7 @@ where let mut ctrl_logoff = match windows::ctrl_logoff() { Ok(s) => s, Err(e) => { - logging!( - error, - Type::SystemSignal, - "Failed to register Ctrl+Logoff: {}", - e - ); + logging!(error, Type::SystemSignal, "Failed to register Ctrl+Logoff: {}", e); return; } }; @@ -94,12 +74,7 @@ where } IS_CLEANING_UP.store(true, Ordering::SeqCst); - logging!( - info, - Type::SystemSignal, - "Caught Windows signal: {}", - signal_name - ); + logging!(info, Type::SystemSignal, "Caught Windows signal: {}", signal_name); f().await; } diff --git a/crates/clash-verge-types/src/runtime.rs b/crates/clash-verge-types/src/runtime.rs index fd0bdf51a..bc38ba9e1 100644 --- a/crates/clash-verge-types/src/runtime.rs +++ b/crates/clash-verge-types/src/runtime.rs @@ -125,9 +125,8 @@ impl IRuntime { && let Some(Value::Sequence(proxies)) = config.get_mut("proxies") { for (i, dialer_proxy) in dialer_proxies.iter().enumerate() { - if let Some(Value::Mapping(proxy)) = proxies - .iter_mut() - .find(|proxy| proxy.get("name") == Some(dialer_proxy)) + if let Some(Value::Mapping(proxy)) = + proxies.iter_mut().find(|proxy| proxy.get("name") == Some(dialer_proxy)) && i != 0 && let Some(dialer_proxy) = dialer_proxies.get(i - 1) { @@ -141,12 +140,9 @@ impl IRuntime { // TODO 完整迁移 enhance 行为后移除 #[inline] fn use_keys<'a>(config: &'a Mapping) -> impl Iterator + 'a { - config - .iter() - .filter_map(|(key, _)| key.as_str()) - .map(|s: &str| { - let mut s: String = s.into(); - s.make_ascii_lowercase(); - s - }) + config.iter().filter_map(|(key, _)| key.as_str()).map(|s: &str| { + let mut s: String = s.into(); + s.make_ascii_lowercase(); + s + }) } diff --git a/crates/tauri-plugin-clash-verge-sysinfo/src/commands.rs b/crates/tauri-plugin-clash-verge-sysinfo/src/commands.rs index 47e24a30c..854dbb1f6 100644 --- a/crates/tauri-plugin-clash-verge-sysinfo/src/commands.rs +++ b/crates/tauri-plugin-clash-verge-sysinfo/src/commands.rs @@ -13,13 +13,7 @@ pub fn get_system_info(state: State<'_, RwLock>) -> Result>) -> Result { - Ok(state - .inner() - .read() - .appinfo - .app_startup_time - .elapsed() - .as_millis()) + Ok(state.inner().read().appinfo.app_startup_time.elapsed().as_millis()) } /// 检查应用是否以管理员身份运行 diff --git a/src-tauri/deny.toml b/deny.toml similarity index 100% rename from src-tauri/deny.toml rename to deny.toml diff --git a/src-tauri/rust-toolchain.toml b/rust-toolchain.toml similarity index 100% rename from src-tauri/rust-toolchain.toml rename to rust-toolchain.toml diff --git a/src-tauri/rustfmt.toml b/rustfmt.toml similarity index 100% rename from src-tauri/rustfmt.toml rename to rustfmt.toml