From 4eeb8834640b79f846eaedebf1869349b49842af Mon Sep 17 00:00:00 2001 From: Tunglies <77394545+Tunglies@users.noreply.github.com> Date: Sun, 9 Nov 2025 22:15:37 +0800 Subject: [PATCH] refactor: update imports to use as _ for unused identifiers across multiple files --- src-tauri/Cargo.toml | 4 ++++ src-tauri/src/cmd/app.rs | 8 ++++---- src-tauri/src/cmd/backup.rs | 2 +- src-tauri/src/cmd/clash.rs | 2 +- src-tauri/src/cmd/network.rs | 4 ++-- src-tauri/src/cmd/profile.rs | 2 +- src-tauri/src/cmd/runtime.rs | 9 +++++++-- src-tauri/src/cmd/save_profile.rs | 6 +++--- src-tauri/src/cmd/service.rs | 2 +- src-tauri/src/cmd/system.rs | 2 +- src-tauri/src/cmd/validate.rs | 2 +- src-tauri/src/cmd/verge.rs | 2 +- src-tauri/src/cmd/webdav.rs | 2 +- src-tauri/src/config/clash.rs | 2 +- src-tauri/src/config/encrypt.rs | 4 ++-- src-tauri/src/config/prfitem.rs | 2 +- src-tauri/src/config/profiles.rs | 4 ++-- src-tauri/src/core/backup.rs | 2 +- src-tauri/src/core/event_driven_proxy.rs | 2 +- src-tauri/src/core/handle.rs | 4 ++-- src-tauri/src/core/hotkey.rs | 2 +- src-tauri/src/core/manager/config.rs | 2 +- src-tauri/src/core/manager/state.rs | 2 +- src-tauri/src/core/notification.rs | 2 +- src-tauri/src/core/service.rs | 2 +- src-tauri/src/core/sysopt.rs | 2 +- src-tauri/src/core/timer.rs | 2 +- src-tauri/src/core/validate.rs | 2 +- src-tauri/src/enhance/mod.rs | 9 ++++++++- src-tauri/src/feat/backup.rs | 2 +- src-tauri/src/feat/profile.rs | 2 +- src-tauri/src/feat/proxy.rs | 2 +- src-tauri/src/lib.rs | 4 ++-- src-tauri/src/module/lightweight.rs | 4 ++-- src-tauri/src/utils/dirs.rs | 2 +- src-tauri/src/utils/help.rs | 2 +- src-tauri/src/utils/init.rs | 10 +++++----- src-tauri/src/utils/logging.rs | 2 +- src-tauri/src/utils/notification.rs | 2 +- src-tauri/src/utils/resolve/dns.rs | 4 ++-- src-tauri/src/utils/server.rs | 2 +- src-tauri/src/utils/window_manager.rs | 2 +- 42 files changed, 74 insertions(+), 58 deletions(-) diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml index 32a5c2709..9f57f1eab 100755 --- a/src-tauri/Cargo.toml +++ b/src-tauri/Cargo.toml @@ -258,3 +258,7 @@ large_types_passed_by_value = "deny" expl_impl_clone_on_copy = "deny" copy_iterator = "deny" cloned_instead_of_copied = "deny" +# self_only_used_in_recursion = "deny" // Since 1.92.0 +unnecessary_self_imports = "deny" +unused_trait_names = "deny" +wildcard_imports = "deny" diff --git a/src-tauri/src/cmd/app.rs b/src-tauri/src/cmd/app.rs index 5fcc5566a..4a806acb7 100644 --- a/src-tauri/src/cmd/app.rs +++ b/src-tauri/src/cmd/app.rs @@ -2,18 +2,18 @@ use super::CmdResult; use crate::core::sysopt::Sysopt; use crate::utils::resolve::ui::{self, UiReadyStage}; use crate::{ - cmd::StringifyErr, + cmd::StringifyErr as _, feat, logging, utils::{ - dirs::{self, PathBufExec}, + dirs::{self, PathBufExec as _}, logging::Type, }, }; use smartstring::alias::String; use std::path::Path; -use tauri::{AppHandle, Manager}; +use tauri::{AppHandle, Manager as _}; use tokio::fs; -use tokio::io::AsyncWriteExt; +use tokio::io::AsyncWriteExt as _; /// 打开应用程序所在目录 #[tauri::command] diff --git a/src-tauri/src/cmd/backup.rs b/src-tauri/src/cmd/backup.rs index a105f4d8a..238e81bdc 100644 --- a/src-tauri/src/cmd/backup.rs +++ b/src-tauri/src/cmd/backup.rs @@ -1,5 +1,5 @@ use super::CmdResult; -use crate::{cmd::StringifyErr, feat}; +use crate::{cmd::StringifyErr as _, feat}; use feat::LocalBackupFile; use smartstring::alias::String; diff --git a/src-tauri/src/cmd/clash.rs b/src-tauri/src/cmd/clash.rs index 7ca0bb454..ab37a4b3d 100644 --- a/src-tauri/src/cmd/clash.rs +++ b/src-tauri/src/cmd/clash.rs @@ -1,7 +1,7 @@ use super::CmdResult; use crate::utils::dirs; use crate::{ - cmd::StringifyErr, + cmd::StringifyErr as _, config::{ClashInfo, Config}, constants, core::{CoreManager, handle, validate::CoreConfigValidator}, diff --git a/src-tauri/src/cmd/network.rs b/src-tauri/src/cmd/network.rs index c0dedfde6..be2fccff8 100644 --- a/src-tauri/src/cmd/network.rs +++ b/src-tauri/src/cmd/network.rs @@ -1,5 +1,5 @@ use super::CmdResult; -use crate::cmd::StringifyErr; +use crate::cmd::StringifyErr as _; use crate::core::{EventDrivenProxyManager, async_proxy_query::AsyncProxyQuery}; use crate::process::AsyncHandler; use crate::{logging, utils::logging::Type}; @@ -93,7 +93,7 @@ pub fn get_network_interfaces() -> Vec { /// 获取网络接口详细信息 #[tauri::command] pub fn get_network_interfaces_info() -> CmdResult> { - use network_interface::{NetworkInterface, NetworkInterfaceConfig}; + use network_interface::{NetworkInterface, NetworkInterfaceConfig as _}; let names = get_network_interfaces(); let interfaces = NetworkInterface::show().stringify_err()?; diff --git a/src-tauri/src/cmd/profile.rs b/src-tauri/src/cmd/profile.rs index 0368d520e..8f2a0f207 100644 --- a/src-tauri/src/cmd/profile.rs +++ b/src-tauri/src/cmd/profile.rs @@ -1,5 +1,5 @@ use super::CmdResult; -use super::StringifyErr; +use super::StringifyErr as _; use crate::{ config::{ Config, IProfiles, PrfItem, PrfOption, diff --git a/src-tauri/src/cmd/runtime.rs b/src-tauri/src/cmd/runtime.rs index 5ecfe954f..d75e470d0 100644 --- a/src-tauri/src/cmd/runtime.rs +++ b/src-tauri/src/cmd/runtime.rs @@ -1,6 +1,11 @@ use super::CmdResult; -use crate::{cmd::StringifyErr, config::*, core::CoreManager, log_err}; -use anyhow::{Context, anyhow}; +use crate::{ + cmd::StringifyErr as _, + config::{Config, ConfigType}, + core::CoreManager, + log_err, +}; +use anyhow::{Context as _, anyhow}; use serde_yaml_ng::Mapping; use smartstring::alias::String; use std::collections::HashMap; diff --git a/src-tauri/src/cmd/save_profile.rs b/src-tauri/src/cmd/save_profile.rs index a52462950..21f2c4040 100644 --- a/src-tauri/src/cmd/save_profile.rs +++ b/src-tauri/src/cmd/save_profile.rs @@ -1,8 +1,8 @@ use super::CmdResult; use crate::{ - cmd::StringifyErr, - config::*, - core::{validate::CoreConfigValidator, *}, + cmd::StringifyErr as _, + config::{Config, PrfItem}, + core::{CoreManager, handle, validate::CoreConfigValidator}, logging, utils::{dirs, logging::Type}, }; diff --git a/src-tauri/src/cmd/service.rs b/src-tauri/src/cmd/service.rs index 7e5b7d2c0..3f7b92273 100644 --- a/src-tauri/src/cmd/service.rs +++ b/src-tauri/src/cmd/service.rs @@ -1,4 +1,4 @@ -use super::{CmdResult, StringifyErr}; +use super::{CmdResult, StringifyErr as _}; use crate::core::service::{self, SERVICE_MANAGER, ServiceStatus}; use smartstring::SmartString; diff --git a/src-tauri/src/cmd/system.rs b/src-tauri/src/cmd/system.rs index 8ba1e6c67..27a4f5f6c 100644 --- a/src-tauri/src/cmd/system.rs +++ b/src-tauri/src/cmd/system.rs @@ -10,7 +10,7 @@ use crate::{ #[cfg(target_os = "windows")] use deelevate::{PrivilegeLevel, Token}; use once_cell::sync::Lazy; -use tauri_plugin_clipboard_manager::ClipboardExt; +use tauri_plugin_clipboard_manager::ClipboardExt as _; use tokio::time::Instant; // 存储应用启动时间的全局变量 diff --git a/src-tauri/src/cmd/validate.rs b/src-tauri/src/cmd/validate.rs index 33536e3b7..a0134f340 100644 --- a/src-tauri/src/cmd/validate.rs +++ b/src-tauri/src/cmd/validate.rs @@ -1,6 +1,6 @@ use super::CmdResult; use crate::{ - core::{validate::CoreConfigValidator, *}, + core::{handle, validate::CoreConfigValidator}, logging, utils::logging::Type, }; diff --git a/src-tauri/src/cmd/verge.rs b/src-tauri/src/cmd/verge.rs index c7b05fe5d..943eb9db6 100644 --- a/src-tauri/src/cmd/verge.rs +++ b/src-tauri/src/cmd/verge.rs @@ -1,5 +1,5 @@ use super::CmdResult; -use crate::{cmd::StringifyErr, config::IVerge, feat, utils::draft::SharedBox}; +use crate::{cmd::StringifyErr as _, config::IVerge, feat, utils::draft::SharedBox}; /// 获取Verge配置 #[tauri::command] diff --git a/src-tauri/src/cmd/webdav.rs b/src-tauri/src/cmd/webdav.rs index 20ae9d048..30e246540 100644 --- a/src-tauri/src/cmd/webdav.rs +++ b/src-tauri/src/cmd/webdav.rs @@ -1,6 +1,6 @@ use super::CmdResult; use crate::{ - cmd::StringifyErr, + cmd::StringifyErr as _, config::{Config, IVerge}, core, feat, }; diff --git a/src-tauri/src/config/clash.rs b/src-tauri/src/config/clash.rs index 195ec6c93..095a0b812 100644 --- a/src-tauri/src/config/clash.rs +++ b/src-tauri/src/config/clash.rs @@ -8,7 +8,7 @@ use serde::{Deserialize, Serialize}; use serde_yaml_ng::{Mapping, Value}; use std::{ net::{IpAddr, Ipv4Addr, SocketAddr}, - str::FromStr, + str::FromStr as _, }; #[derive(Default, Debug, Clone)] diff --git a/src-tauri/src/config/encrypt.rs b/src-tauri/src/config/encrypt.rs index 44ac85b15..71743fae4 100644 --- a/src-tauri/src/config/encrypt.rs +++ b/src-tauri/src/config/encrypt.rs @@ -1,9 +1,9 @@ use crate::utils::dirs::get_encryption_key; use aes_gcm::{ Aes256Gcm, Key, - aead::{Aead, KeyInit}, + aead::{Aead as _, KeyInit as _}, }; -use base64::{Engine, engine::general_purpose::STANDARD}; +use base64::{Engine as _, engine::general_purpose::STANDARD}; use serde::{Deserialize, Deserializer, Serialize, Serializer}; use std::cell::Cell; use std::future::Future; diff --git a/src-tauri/src/config/prfitem.rs b/src-tauri/src/config/prfitem.rs index e817d7108..bdbac0183 100644 --- a/src-tauri/src/config/prfitem.rs +++ b/src-tauri/src/config/prfitem.rs @@ -6,7 +6,7 @@ use crate::{ tmpl, }, }; -use anyhow::{Context, Result, bail}; +use anyhow::{Context as _, Result, bail}; use serde::{Deserialize, Serialize}; use serde_yaml_ng::Mapping; use smartstring::alias::String; diff --git a/src-tauri/src/config/profiles.rs b/src-tauri/src/config/profiles.rs index 0ee3557ef..0f8a83671 100644 --- a/src-tauri/src/config/profiles.rs +++ b/src-tauri/src/config/profiles.rs @@ -1,10 +1,10 @@ use super::{PrfOption, prfitem::PrfItem}; use crate::utils::{ - dirs::{self, PathBufExec}, + dirs::{self, PathBufExec as _}, help, }; use crate::{logging, utils::logging::Type}; -use anyhow::{Context, Result, bail}; +use anyhow::{Context as _, Result, bail}; use serde::{Deserialize, Serialize}; use serde_yaml_ng::Mapping; use smartstring::alias::String; diff --git a/src-tauri/src/core/backup.rs b/src-tauri/src/core/backup.rs index 229139801..ad3168546 100644 --- a/src-tauri/src/core/backup.rs +++ b/src-tauri/src/core/backup.rs @@ -13,7 +13,7 @@ use smartstring::alias::String; use std::{ collections::HashMap, env::{consts::OS, temp_dir}, - io::Write, + io::Write as _, path::PathBuf, sync::Arc, time::Duration, diff --git a/src-tauri/src/core/event_driven_proxy.rs b/src-tauri/src/core/event_driven_proxy.rs index e6a711490..b4257be26 100644 --- a/src-tauri/src/core/event_driven_proxy.rs +++ b/src-tauri/src/core/event_driven_proxy.rs @@ -2,7 +2,7 @@ use std::sync::Arc; use tokio::sync::RwLock; use tokio::sync::{mpsc, oneshot}; use tokio::time::{Duration, sleep, timeout}; -use tokio_stream::{StreamExt, wrappers::UnboundedReceiverStream}; +use tokio_stream::{StreamExt as _, wrappers::UnboundedReceiverStream}; use crate::config::{Config, IVerge}; use crate::core::{async_proxy_query::AsyncProxyQuery, handle}; diff --git a/src-tauri/src/core/handle.rs b/src-tauri/src/core/handle.rs index 894688f96..a5c973a61 100644 --- a/src-tauri/src/core/handle.rs +++ b/src-tauri/src/core/handle.rs @@ -8,8 +8,8 @@ use std::{ }, thread, }; -use tauri::{AppHandle, Manager, WebviewWindow}; -use tauri_plugin_mihomo::{Mihomo, MihomoExt}; +use tauri::{AppHandle, Manager as _, WebviewWindow}; +use tauri_plugin_mihomo::{Mihomo, MihomoExt as _}; use tokio::sync::RwLockReadGuard; use super::notification::{ErrorMessage, FrontendEvent, NotificationSystem}; diff --git a/src-tauri/src/core/hotkey.rs b/src-tauri/src/core/hotkey.rs index f2b2d0be0..44db1f019 100755 --- a/src-tauri/src/core/hotkey.rs +++ b/src-tauri/src/core/hotkey.rs @@ -8,7 +8,7 @@ use anyhow::{Result, bail}; use arc_swap::ArcSwap; use smartstring::alias::String; use std::{collections::HashMap, fmt, str::FromStr, sync::Arc}; -use tauri_plugin_global_shortcut::{Code, GlobalShortcutExt, ShortcutState}; +use tauri_plugin_global_shortcut::{Code, GlobalShortcutExt as _, ShortcutState}; /// Enum representing all available hotkey functions #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)] diff --git a/src-tauri/src/core/manager/config.rs b/src-tauri/src/core/manager/config.rs index 295230ab0..64283a590 100644 --- a/src-tauri/src/core/manager/config.rs +++ b/src-tauri/src/core/manager/config.rs @@ -1,6 +1,6 @@ use super::CoreManager; use crate::{ - config::*, + config::{Config, ConfigType, IRuntime}, constants::timing, core::{handle, validate::CoreConfigValidator}, logging, diff --git a/src-tauri/src/core/manager/state.rs b/src-tauri/src/core/manager/state.rs index 2be3be1ba..520c1f2a1 100644 --- a/src-tauri/src/core/manager/state.rs +++ b/src-tauri/src/core/manager/state.rs @@ -16,7 +16,7 @@ use compact_str::CompactString; use flexi_logger::DeferredNow; use log::Level; use scopeguard::defer; -use tauri_plugin_shell::ShellExt; +use tauri_plugin_shell::ShellExt as _; impl CoreManager { pub async fn get_clash_logs(&self) -> Result> { diff --git a/src-tauri/src/core/notification.rs b/src-tauri/src/core/notification.rs index 83680c249..fba5ecaa1 100644 --- a/src-tauri/src/core/notification.rs +++ b/src-tauri/src/core/notification.rs @@ -14,7 +14,7 @@ use std::{ thread, time::{Duration, Instant}, }; -use tauri::{Emitter, WebviewWindow}; +use tauri::{Emitter as _, WebviewWindow}; #[derive(Debug, Clone)] pub enum FrontendEvent { diff --git a/src-tauri/src/core/service.rs b/src-tauri/src/core/service.rs index 1737b9666..4fa48dba2 100644 --- a/src-tauri/src/core/service.rs +++ b/src-tauri/src/core/service.rs @@ -4,7 +4,7 @@ use crate::{ logging, logging_error, utils::{dirs, init::service_writer_config, logging::Type}, }; -use anyhow::{Context, Result, bail}; +use anyhow::{Context as _, Result, bail}; use clash_verge_service_ipc::CoreConfig; use compact_str::CompactString; use once_cell::sync::Lazy; diff --git a/src-tauri/src/core/sysopt.rs b/src-tauri/src/core/sysopt.rs index 964afa068..67a75b620 100644 --- a/src-tauri/src/core/sysopt.rs +++ b/src-tauri/src/core/sysopt.rs @@ -12,7 +12,7 @@ use smartstring::alias::String; use std::sync::atomic::{AtomicBool, Ordering}; #[cfg(not(target_os = "windows"))] use sysproxy::{Autoproxy, Sysproxy}; -use tauri_plugin_autostart::ManagerExt; +use tauri_plugin_autostart::ManagerExt as _; pub struct Sysopt { initialed: AtomicBool, diff --git a/src-tauri/src/core/timer.rs b/src-tauri/src/core/timer.rs index c19c43dd2..20c0bb6c0 100644 --- a/src-tauri/src/core/timer.rs +++ b/src-tauri/src/core/timer.rs @@ -2,7 +2,7 @@ use crate::{ config::Config, core::sysopt::Sysopt, feat, logging, logging_error, singleton, utils::logging::Type, }; -use anyhow::{Context, Result}; +use anyhow::{Context as _, Result}; use delay_timer::prelude::{DelayTimer, DelayTimerBuilder, TaskBuilder}; use parking_lot::RwLock; use smartstring::alias::String; diff --git a/src-tauri/src/core/validate.rs b/src-tauri/src/core/validate.rs index bfb31b628..330c96f3c 100644 --- a/src-tauri/src/core/validate.rs +++ b/src-tauri/src/core/validate.rs @@ -2,7 +2,7 @@ use anyhow::Result; use scopeguard::defer; use smartstring::alias::String; use std::sync::atomic::{AtomicBool, Ordering}; -use tauri_plugin_shell::ShellExt; +use tauri_plugin_shell::ShellExt as _; use tokio::fs; use crate::config::{Config, ConfigType}; diff --git a/src-tauri/src/enhance/mod.rs b/src-tauri/src/enhance/mod.rs index 7699ca133..6b74b74a0 100644 --- a/src-tauri/src/enhance/mod.rs +++ b/src-tauri/src/enhance/mod.rs @@ -5,7 +5,14 @@ mod script; pub mod seq; mod tun; -use self::{chain::*, field::*, merge::*, script::*, seq::*, tun::*}; +use self::{ + chain::{AsyncChainItemFrom as _, ChainItem, ChainType}, + field::{use_keys, use_lowercase, use_sort}, + merge::use_merge, + script::use_script, + seq::{SeqMap, use_seq}, + tun::use_tun, +}; use crate::constants; use crate::utils::dirs; use crate::{config::Config, utils::tmpl}; diff --git a/src-tauri/src/feat/backup.rs b/src-tauri/src/feat/backup.rs index 2aac55056..d55b1eaf1 100644 --- a/src-tauri/src/feat/backup.rs +++ b/src-tauri/src/feat/backup.rs @@ -4,7 +4,7 @@ use crate::{ logging, logging_error, process::AsyncHandler, utils::{ - dirs::{PathBufExec, app_home_dir, local_backup_dir}, + dirs::{PathBufExec as _, app_home_dir, local_backup_dir}, logging::Type, }, }; diff --git a/src-tauri/src/feat/profile.rs b/src-tauri/src/feat/profile.rs index ff4e42928..83446aeb9 100644 --- a/src-tauri/src/feat/profile.rs +++ b/src-tauri/src/feat/profile.rs @@ -7,7 +7,7 @@ use crate::{ }; use anyhow::{Result, bail}; use smartstring::alias::String; -use tauri::Emitter; +use tauri::Emitter as _; /// Toggle proxy profile pub async fn toggle_proxy_profile(profile_index: String) { diff --git a/src-tauri/src/feat/proxy.rs b/src-tauri/src/feat/proxy.rs index 9f7d513e8..69d4e0339 100644 --- a/src-tauri/src/feat/proxy.rs +++ b/src-tauri/src/feat/proxy.rs @@ -5,7 +5,7 @@ use crate::{ utils::logging::Type, }; use std::env; -use tauri_plugin_clipboard_manager::ClipboardExt; +use tauri_plugin_clipboard_manager::ClipboardExt as _; /// Toggle system proxy on/off pub async fn toggle_system_proxy() { diff --git a/src-tauri/src/lib.rs b/src-tauri/src/lib.rs index 42758a4f9..a702bc571 100644 --- a/src-tauri/src/lib.rs +++ b/src-tauri/src/lib.rs @@ -26,10 +26,10 @@ use anyhow::Result; use config::Config; use once_cell::sync::OnceCell; use rust_i18n::i18n; -use tauri::{AppHandle, Manager}; +use tauri::{AppHandle, Manager as _}; #[cfg(target_os = "macos")] use tauri_plugin_autostart::MacosLauncher; -use tauri_plugin_deep_link::DeepLinkExt; +use tauri_plugin_deep_link::DeepLinkExt as _; use utils::logging::Type; i18n!("locales", fallback = "zh"); diff --git a/src-tauri/src/module/lightweight.rs b/src-tauri/src/module/lightweight.rs index 30dd141cb..25978b163 100644 --- a/src-tauri/src/module/lightweight.rs +++ b/src-tauri/src/module/lightweight.rs @@ -10,10 +10,10 @@ use crate::{ use crate::logging_error; use crate::utils::window_manager::WindowManager; -use anyhow::{Context, Result}; +use anyhow::{Context as _, Result}; use delay_timer::prelude::TaskBuilder; use std::sync::atomic::{AtomicU8, AtomicU32, Ordering}; -use tauri::Listener; +use tauri::Listener as _; const LIGHT_WEIGHT_TASK_UID: &str = "light_weight_task"; diff --git a/src-tauri/src/utils/dirs.rs b/src-tauri/src/utils/dirs.rs index f83af90f4..6f678696e 100644 --- a/src-tauri/src/utils/dirs.rs +++ b/src-tauri/src/utils/dirs.rs @@ -9,7 +9,7 @@ use once_cell::sync::OnceCell; #[cfg(unix)] use std::iter; use std::{fs, path::PathBuf}; -use tauri::Manager; +use tauri::Manager as _; #[cfg(not(feature = "verge-dev"))] pub static APP_ID: &str = "io.github.clash-verge-rev.clash-verge-rev"; diff --git a/src-tauri/src/utils/help.rs b/src-tauri/src/utils/help.rs index 1fc58d036..a33b365a4 100644 --- a/src-tauri/src/utils/help.rs +++ b/src-tauri/src/utils/help.rs @@ -1,5 +1,5 @@ use crate::{config::with_encryption, enhance::seq::SeqMap, logging, utils::logging::Type}; -use anyhow::{Context, Result, anyhow, bail}; +use anyhow::{Context as _, Result, anyhow, bail}; use nanoid::nanoid; use serde::{Serialize, de::DeserializeOwned}; use serde_yaml_ng::Mapping; diff --git a/src-tauri/src/utils/init.rs b/src-tauri/src/utils/init.rs index cb8d3e6c8..5a3853a46 100644 --- a/src-tauri/src/utils/init.rs +++ b/src-tauri/src/utils/init.rs @@ -2,26 +2,26 @@ #[cfg(not(feature = "tauri-dev"))] use crate::utils::logging::NoModuleFilter; use crate::{ - config::*, + config::{Config, IClashTemp, IProfiles, IVerge}, constants, core::handle, logging, process::AsyncHandler, utils::{ - dirs::{self, PathBufExec, service_log_dir, sidecar_log_dir}, + dirs::{self, PathBufExec as _, service_log_dir, sidecar_log_dir}, help, logging::Type, }, }; use anyhow::Result; -use chrono::{Local, TimeZone}; +use chrono::{Local, TimeZone as _}; use clash_verge_service_ipc::WriterConfig; use flexi_logger::writers::FileLogWriter; use flexi_logger::{Cleanup, Criterion, FileSpec}; #[cfg(not(feature = "tauri-dev"))] use flexi_logger::{Duplicate, LogSpecBuilder, Logger}; -use std::{path::PathBuf, str::FromStr}; -use tauri_plugin_shell::ShellExt; +use std::{path::PathBuf, str::FromStr as _}; +use tauri_plugin_shell::ShellExt as _; use tokio::fs; use tokio::fs::DirEntry; diff --git a/src-tauri/src/utils/logging.rs b/src-tauri/src/utils/logging.rs index 35353c81e..7b5de419b 100644 --- a/src-tauri/src/utils/logging.rs +++ b/src-tauri/src/utils/logging.rs @@ -3,7 +3,7 @@ use flexi_logger::DeferredNow; #[cfg(not(feature = "tauri-dev"))] use flexi_logger::filter::LogLineFilter; use flexi_logger::writers::FileLogWriter; -use flexi_logger::writers::LogWriter; +use flexi_logger::writers::LogWriter as _; use log::Level; use log::Record; use std::{fmt, sync::Arc}; diff --git a/src-tauri/src/utils/notification.rs b/src-tauri/src/utils/notification.rs index 5370132d3..d7ff371a5 100644 --- a/src-tauri/src/utils/notification.rs +++ b/src-tauri/src/utils/notification.rs @@ -1,5 +1,5 @@ use crate::{core::handle, utils::i18n}; -use tauri_plugin_notification::NotificationExt; +use tauri_plugin_notification::NotificationExt as _; pub enum NotificationEvent<'a> { DashboardToggled, diff --git a/src-tauri/src/utils/resolve/dns.rs b/src-tauri/src/utils/resolve/dns.rs index e225f0c80..0896bccaf 100644 --- a/src-tauri/src/utils/resolve/dns.rs +++ b/src-tauri/src/utils/resolve/dns.rs @@ -3,7 +3,7 @@ use crate::{logging, utils::logging::Type}; pub async fn set_public_dns(dns_server: String) { use crate::utils::logging::Type; use crate::{core::handle, logging, utils::dirs}; - use tauri_plugin_shell::ShellExt; + use tauri_plugin_shell::ShellExt as _; let app_handle = handle::Handle::app_handle(); logging!(info, Type::Config, "try to set system dns"); @@ -50,7 +50,7 @@ pub async fn set_public_dns(dns_server: String) { #[cfg(target_os = "macos")] pub async fn restore_public_dns() { use crate::{core::handle, utils::dirs}; - use tauri_plugin_shell::ShellExt; + use tauri_plugin_shell::ShellExt as _; let app_handle = handle::Handle::app_handle(); logging!(info, Type::Config, "try to unset system dns"); let resource_dir = match dirs::app_resources_dir() { diff --git a/src-tauri/src/utils/server.rs b/src-tauri/src/utils/server.rs index 9e8e12296..f4d7ea6ad 100644 --- a/src-tauri/src/utils/server.rs +++ b/src-tauri/src/utils/server.rs @@ -14,7 +14,7 @@ use reqwest::ClientBuilder; use smartstring::alias::String; use std::time::Duration; use tokio::sync::oneshot; -use warp::Filter; +use warp::Filter as _; #[derive(serde::Deserialize, Debug)] struct QueryParam { diff --git a/src-tauri/src/utils/window_manager.rs b/src-tauri/src/utils/window_manager.rs index 801b38942..c6a535696 100644 --- a/src-tauri/src/utils/window_manager.rs +++ b/src-tauri/src/utils/window_manager.rs @@ -5,7 +5,7 @@ use crate::{ }; use std::future::Future; use std::pin::Pin; -use tauri::{Manager, WebviewWindow, Wry}; +use tauri::{Manager as _, WebviewWindow, Wry}; use once_cell::sync::OnceCell; use parking_lot::Mutex;