From fefc5c23fdd1b7191f5813e5dadf16aababf6333 Mon Sep 17 00:00:00 2001 From: Tunglies <77394545+Tunglies@users.noreply.github.com> Date: Tue, 14 Oct 2025 11:48:53 +0800 Subject: [PATCH] fix: simplify error handling in change_clash_core and validate_dns_config functions --- src-tauri/src/cmd/clash.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src-tauri/src/cmd/clash.rs b/src-tauri/src/cmd/clash.rs index 8cfd8804d..dfb2f7327 100644 --- a/src-tauri/src/cmd/clash.rs +++ b/src-tauri/src/cmd/clash.rs @@ -67,7 +67,7 @@ pub async fn change_clash_core(clash_core: String) -> CmdResult> } } Err(err) => { - let error_msg = err.into(); + let error_msg = err; logging!(error, Type::Core, "failed to change core: {error_msg}"); handle::Handle::notice_message("config_core::change_error", &error_msg); Ok(Some(error_msg)) @@ -267,10 +267,10 @@ pub async fn validate_dns_config() -> CmdResult<(bool, String)> { return Ok((false, "DNS config file not found".into())); } - Ok(CoreManager::global() + CoreManager::global() .validate_config_file(dns_path_str, None) .await - .stringify_err()?) + .stringify_err() } #[tauri::command]