diff --git a/package.json b/package.json index b25c0ee5..7925b77d 100644 --- a/package.json +++ b/package.json @@ -3,8 +3,8 @@ "version": "2.2.4-alpha.2", "license": "GPL-3.0-only", "scripts": { - "dev": "cross-env RUST_BACKTRACE=1 tauri dev -f verge-dev -- --profile fast-dev", - "dev:diff": "cross-env RUST_BACKTRACE=1 tauri dev -f verge-dev -- --profile fast-dev", + "dev": "cross-env RUST_BACKTRACE=1 tauri dev -f verge-dev", + "dev:diff": "cross-env RUST_BACKTRACE=1 tauri dev -f verge-dev", "build": "cross-env NODE_OPTIONS='--max-old-space-size=4096' tauri build", "build:fast": "cross-env NODE_OPTIONS='--max-old-space-size=4096' tauri build -- --profile fast-release", "tauri": "tauri", diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml index e32f70c6..a3488934 100755 --- a/src-tauri/Cargo.toml +++ b/src-tauri/Cargo.toml @@ -104,6 +104,10 @@ strip = true [profile.dev] incremental = true +codegen-units = 256 # 增加编译单元,提升编译速度 +opt-level = 0 # 禁用优化,进一步提升编译速度 +debug = true # 保留调试信息 +strip = false # 不剥离符号,保留调试信息 [profile.fast-release] inherits = "release" # 继承 release 的配置 @@ -114,14 +118,6 @@ opt-level = 0 # 禁用优化,大幅提升编译速度 debug = true # 保留调试信息 strip = false # 不剥离符号,保留调试信息 -[profile.fast-dev] -inherits = "dev" # 继承 dev 的配置 -codegen-units = 256 # 增加编译单元,提升编译速度 -opt-level = 0 # 禁用优化,进一步提升编译速度 -incremental = true # 启用增量编译 -debug = true # 保留调试信息 -strip = false # 不剥离符号,保留调试信息 - [lib] name = "app_lib" crate-type = ["staticlib", "cdylib", "rlib"] diff --git a/src-tauri/src/core/mod.rs b/src-tauri/src/core/mod.rs index 793472a3..ec014748 100644 --- a/src-tauri/src/core/mod.rs +++ b/src-tauri/src/core/mod.rs @@ -9,5 +9,4 @@ pub mod timer; pub mod tray; pub mod win_uwp; -pub use self::core::*; -pub use self::timer::Timer; +pub use self::{core::*, timer::Timer}; diff --git a/src-tauri/src/feat/window.rs b/src-tauri/src/feat/window.rs index 37e61e07..835410a9 100644 --- a/src-tauri/src/feat/window.rs +++ b/src-tauri/src/feat/window.rs @@ -79,16 +79,16 @@ pub fn clean() -> bool { // 1. 处理TUN模式 let tun_success = if Config::verge().data().enable_tun_mode.unwrap_or(false) { let disable_tun = serde_json::json!({ - "tun": { - "enable": false - } - }); + "tun": { + "enable": false + } + }); timeout( Duration::from_secs(1), MihomoManager::global().patch_configs(disable_tun), ) - .await - .is_ok() + .await + .is_ok() } else { true }; @@ -98,7 +98,7 @@ pub fn clean() -> bool { Duration::from_secs(1), sysopt::Sysopt::global().reset_sysproxy(), ) - .await; + .await; let core_res = timeout(Duration::from_secs(1), CoreManager::global().stop_core()).await;