mirror of
https://github.com/clash-verge-rev/clash-verge-rev.git
synced 2026-04-16 23:40:32 +08:00
chore: update Rust toolchain to version 1.91 and adjust edition in rustfmt configuration
This commit is contained in:
parent
c763fdd233
commit
f644036e08
@ -8,6 +8,7 @@ repository = "https://github.com/clash-verge-rev/clash-verge-rev.git"
|
|||||||
default-run = "clash-verge"
|
default-run = "clash-verge"
|
||||||
edition = "2024"
|
edition = "2024"
|
||||||
build = "build.rs"
|
build = "build.rs"
|
||||||
|
rust-version = "1.91"
|
||||||
|
|
||||||
[package.metadata.bundle]
|
[package.metadata.bundle]
|
||||||
identifier = "io.github.clash-verge-rev.clash-verge-rev"
|
identifier = "io.github.clash-verge-rev.clash-verge-rev"
|
||||||
|
|||||||
3
src-tauri/rust-toolchain.toml
Normal file
3
src-tauri/rust-toolchain.toml
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
[toolchain]
|
||||||
|
channel = "1.91.0"
|
||||||
|
components = ["rustfmt", "clippy"]
|
||||||
@ -6,7 +6,7 @@ use_small_heuristics = "Default"
|
|||||||
reorder_imports = true
|
reorder_imports = true
|
||||||
reorder_modules = true
|
reorder_modules = true
|
||||||
remove_nested_parens = true
|
remove_nested_parens = true
|
||||||
edition = "2021"
|
edition = "2024"
|
||||||
merge_derives = true
|
merge_derives = true
|
||||||
use_try_shorthand = false
|
use_try_shorthand = false
|
||||||
use_field_init_shorthand = false
|
use_field_init_shorthand = false
|
||||||
|
|||||||
@ -92,7 +92,8 @@ impl WebDavClient {
|
|||||||
|| verge.webdav_username.is_none()
|
|| verge.webdav_username.is_none()
|
||||||
|| verge.webdav_password.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));
|
return Err(anyhow::Error::msg(msg));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -262,7 +262,9 @@ impl DmabufDecision {
|
|||||||
if intel_gpu.inconclusive {
|
if intel_gpu.inconclusive {
|
||||||
decision.message = Some("Wayland 上检测到 Intel GPU,但缺少 boot_vga 信息:预防性禁用 WebKit DMABUF,若确认非主 GPU 可通过 CLASH_VERGE_DMABUF=1 覆盖。".into());
|
decision.message = Some("Wayland 上检测到 Intel GPU,但缺少 boot_vga 信息:预防性禁用 WebKit DMABUF,若确认非主 GPU 可通过 CLASH_VERGE_DMABUF=1 覆盖。".into());
|
||||||
} else {
|
} 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 {
|
} else if session.is_wayland {
|
||||||
decision.message = Some(
|
decision.message = Some(
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user