From f644036e087fa25bf0e971c6ef7ee0fce9dc1f75 Mon Sep 17 00:00:00 2001 From: Tunglies <77394545+Tunglies@users.noreply.github.com> Date: Sun, 9 Nov 2025 16:31:37 +0800 Subject: [PATCH] chore: update Rust toolchain to version 1.91 and adjust edition in rustfmt configuration --- src-tauri/Cargo.toml | 1 + src-tauri/rust-toolchain.toml | 3 +++ src-tauri/rustfmt.toml | 2 +- src-tauri/src/core/backup.rs | 3 ++- src-tauri/src/utils/linux.rs | 4 +++- 5 files changed, 10 insertions(+), 3 deletions(-) create mode 100644 src-tauri/rust-toolchain.toml diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml index 13cc038b0..7385c7e6e 100755 --- a/src-tauri/Cargo.toml +++ b/src-tauri/Cargo.toml @@ -8,6 +8,7 @@ repository = "https://github.com/clash-verge-rev/clash-verge-rev.git" default-run = "clash-verge" edition = "2024" build = "build.rs" +rust-version = "1.91" [package.metadata.bundle] identifier = "io.github.clash-verge-rev.clash-verge-rev" diff --git a/src-tauri/rust-toolchain.toml b/src-tauri/rust-toolchain.toml new file mode 100644 index 000000000..cdeba7a2b --- /dev/null +++ b/src-tauri/rust-toolchain.toml @@ -0,0 +1,3 @@ +[toolchain] +channel = "1.91.0" +components = ["rustfmt", "clippy"] diff --git a/src-tauri/rustfmt.toml b/src-tauri/rustfmt.toml index baaa750e3..7e141a0b8 100644 --- a/src-tauri/rustfmt.toml +++ b/src-tauri/rustfmt.toml @@ -6,7 +6,7 @@ use_small_heuristics = "Default" reorder_imports = true reorder_modules = true remove_nested_parens = true -edition = "2021" +edition = "2024" merge_derives = true use_try_shorthand = false use_field_init_shorthand = false diff --git a/src-tauri/src/core/backup.rs b/src-tauri/src/core/backup.rs index 023167580..11681ab06 100644 --- a/src-tauri/src/core/backup.rs +++ b/src-tauri/src/core/backup.rs @@ -92,7 +92,8 @@ impl WebDavClient { || verge.webdav_username.is_none() || verge.webdav_password.is_none() { - let msg: String = "Unable to create web dav client, please make sure the webdav config is correct".into(); + let msg: String = + "Unable to create web dav client, please make sure the webdav config is correct".into(); return Err(anyhow::Error::msg(msg)); } diff --git a/src-tauri/src/utils/linux.rs b/src-tauri/src/utils/linux.rs index 65e0ae49f..e3ced3871 100644 --- a/src-tauri/src/utils/linux.rs +++ b/src-tauri/src/utils/linux.rs @@ -262,7 +262,9 @@ impl DmabufDecision { if intel_gpu.inconclusive { decision.message = Some("Wayland 上检测到 Intel GPU,但缺少 boot_vga 信息:预防性禁用 WebKit DMABUF,若确认非主 GPU 可通过 CLASH_VERGE_DMABUF=1 覆盖。".into()); } else { - decision.message = Some("Wayland 上检测到 Intel 主 GPU (0x8086):禁用 WebKit DMABUF 以避免帧缓冲失败。".into()); + decision.message = Some( + "Wayland 上检测到 Intel 主 GPU (0x8086):禁用 WebKit DMABUF 以避免帧缓冲失败。".into(), + ); } } else if session.is_wayland { decision.message = Some(