Refactor string handling to use into() instead of to_string() for improved performance and consistency across the codebase. This change affects various modules including app.rs, clash.rs, config.rs, core.rs, service.rs, and others, ensuring that string conversions are streamlined and more idiomatic.

src-tauri/src/cmd/app.rs

@@ -68,9 +68,7 @@ pub fn get_portable_flag() -> CmdResult<bool> {
 /// 获取应用目录
 #[tauri::command]
 pub fn get_app_dir() -> CmdResult<String> {
-    let app_home_dir = wrap_err!(dirs::app_home_dir())?
-        .to_string_lossy()
-        .to_string();
+    let app_home_dir = wrap_err!(dirs::app_home_dir())?.to_string_lossy().into();
     Ok(app_home_dir)
 }
 
@@ -88,7 +86,7 @@ pub async fn download_icon_cache(url: String, name: String) -> CmdResult<String>
     let icon_path = icon_cache_dir.join(&name);
 
     if icon_path.exists() {
-        return Ok(icon_path.to_string_lossy().to_string());
+        return Ok(icon_path.to_string_lossy().into());
     }
 
     if !icon_cache_dir.exists() {
@@ -120,7 +118,7 @@ pub async fn download_icon_cache(url: String, name: String) -> CmdResult<String>
                 Ok(file) => file,
                 Err(_) => {
                     if icon_path.exists() {
-                        return Ok(icon_path.to_string_lossy().to_string());
+                        return Ok(icon_path.to_string_lossy().into());
                     }
                     return Err("Failed to create temporary file".into());
                 }
@@ -135,7 +133,7 @@ pub async fn download_icon_cache(url: String, name: String) -> CmdResult<String>
                 Err(_) => {
                     let _ = std::fs::remove_file(&temp_path);
                     if icon_path.exists() {
-                        return Ok(icon_path.to_string_lossy().to_string());
+                        return Ok(icon_path.to_string_lossy().into());
                     }
                 }
             }
@@ -143,7 +141,7 @@ pub async fn download_icon_cache(url: String, name: String) -> CmdResult<String>
             let _ = std::fs::remove_file(&temp_path);
         }
 
-        Ok(icon_path.to_string_lossy().to_string())
+        Ok(icon_path.to_string_lossy().into())
     } else {
         let _ = std::fs::remove_file(&temp_path);
         Err(format!("下载的内容不是有效图片: {url}"))
@@ -168,9 +166,9 @@ pub fn copy_icon_file(path: String, icon_info: IconInfo) -> CmdResult<String> {
     if !icon_dir.exists() {
         let _ = fs::create_dir_all(&icon_dir);
     }
-    let ext = match file_path.extension() {
-        Some(e) => e.to_string_lossy().to_string(),
-        None => "ico".to_string(),
+    let ext: String = match file_path.extension() {
+        Some(e) => e.to_string_lossy().into(),
+        None => "ico".into(),
     };
 
     let dest_path = icon_dir.join(format!(
@@ -196,11 +194,11 @@ pub fn copy_icon_file(path: String, icon_info: IconInfo) -> CmdResult<String> {
             dest_path
         );
         match fs::copy(file_path, &dest_path) {
-            Ok(_) => Ok(dest_path.to_string_lossy().to_string()),
+            Ok(_) => Ok(dest_path.to_string_lossy().into()),
             Err(err) => Err(err.to_string()),
         }
     } else {
-        Err("file not found".to_string())
+        Err("file not found".into())
     }
 }
 

src-tauri/src/cmd/clash.rs

@@ -2,6 +2,7 @@ use std::collections::VecDeque;
 
 use super::CmdResult;
 use crate::{
+    cmd::StringifyErr,
     config::Config,
     core::{CoreManager, handle},
 };
@@ -66,7 +67,7 @@ pub async fn change_clash_core(clash_core: String) -> CmdResult<Option<String>>
             }
         }
         Err(err) => {
-            let error_msg = err.to_string();
+            let error_msg = err.into();
             logging!(error, Type::Core, "failed to change core: {error_msg}");
             handle::Handle::notice_message("config_core::change_error", &error_msg);
             Ok(Some(error_msg))
@@ -126,14 +127,12 @@ pub async fn save_dns_config(dns_config: Mapping) -> CmdResult {
 
     // 获取DNS配置文件路径
     let dns_path = dirs::app_home_dir()
-        .map_err(|e| e.to_string())?
+        .stringify_err()?
         .join("dns_config.yaml");
 
     // 保存DNS配置到文件
-    let yaml_str = serde_yaml_ng::to_string(&dns_config).map_err(|e| e.to_string())?;
-    fs::write(&dns_path, yaml_str)
-        .await
-        .map_err(|e| e.to_string())?;
+    let yaml_str = serde_yaml_ng::to_string(&dns_config).stringify_err()?;
+    fs::write(&dns_path, yaml_str).await.stringify_err()?;
     logging!(info, Type::Config, "DNS config saved to {dns_path:?}");
 
     Ok(())
@@ -151,7 +150,7 @@ pub async fn apply_dns_config(apply: bool) -> CmdResult {
     if apply {
         // 读取DNS配置文件
         let dns_path = dirs::app_home_dir()
-            .map_err(|e| e.to_string())?
+            .stringify_err()?
             .join("dns_config.yaml");
 
         if !dns_path.exists() {
@@ -159,16 +158,16 @@ pub async fn apply_dns_config(apply: bool) -> CmdResult {
             return Err("DNS config file not found".into());
         }
 
-        let dns_yaml = tokio::fs::read_to_string(&dns_path).await.map_err(|e| {
-            logging!(error, Type::Config, "Failed to read DNS config: {e}");
-            e.to_string()
-        })?;
+        let dns_yaml = tokio::fs::read_to_string(&dns_path)
+            .await
+            .stringify_err_log(|e| {
+                logging!(error, Type::Config, "Failed to read DNS config: {e}");
+            })?;
 
         // 解析DNS配置
-        let patch_config =
-            serde_yaml_ng::from_str::<serde_yaml_ng::Mapping>(&dns_yaml).map_err(|e| {
+        let patch_config = serde_yaml_ng::from_str::<serde_yaml_ng::Mapping>(&dns_yaml)
+            .stringify_err_log(|e| {
                 logging!(error, Type::Config, "Failed to parse DNS config: {e}");
-                e.to_string()
             })?;
 
         logging!(info, Type::Config, "Applying DNS config from file");
@@ -181,24 +180,19 @@ pub async fn apply_dns_config(apply: bool) -> CmdResult {
         Config::runtime().await.draft_mut().patch_config(patch);
 
         // 重新生成配置
-        Config::generate().await.map_err(|err| {
-            logging!(
-                error,
-                Type::Config,
-                "Failed to regenerate config with DNS: {err}"
-            );
-            "Failed to regenerate config with DNS".to_string()
+        Config::generate().await.stringify_err_log(|err| {
+            let err = format!("Failed to regenerate config with DNS: {err}");
+            logging!(error, Type::Config, "{err}");
         })?;
 
         // 应用新配置
-        CoreManager::global().update_config().await.map_err(|err| {
-            logging!(
-                error,
-                Type::Config,
-                "Failed to apply config with DNS: {err}"
-            );
-            "Failed to apply config with DNS".to_string()
-        })?;
+        CoreManager::global()
+            .update_config()
+            .await
+            .stringify_err_log(|err| {
+                let err = format!("Failed to apply config with DNS: {err}");
+                logging!(error, Type::Config, "{err}");
+            })?;
 
         logging!(info, Type::Config, "DNS config successfully applied");
         handle::Handle::refresh_clash();
@@ -210,19 +204,18 @@ pub async fn apply_dns_config(apply: bool) -> CmdResult {
             "DNS settings disabled, regenerating config"
         );
 
-        Config::generate().await.map_err(|err| {
-            logging!(error, Type::Config, "Failed to regenerate config: {err}");
-            "Failed to regenerate config".to_string()
+        Config::generate().await.stringify_err_log(|err| {
+            let err = format!("Failed to regenerate config: {err}");
+            logging!(error, Type::Config, "{err}");
         })?;
 
-        CoreManager::global().update_config().await.map_err(|err| {
-            logging!(
-                error,
-                Type::Config,
-                "Failed to apply regenerated config: {err}"
-            );
-            "Failed to apply regenerated config".to_string()
-        })?;
+        CoreManager::global()
+            .update_config()
+            .await
+            .stringify_err_log(|err| {
+                let err = format!("Failed to apply regenerated config: {err}");
+                logging!(error, Type::Config, "{err}");
+            })?;
 
         logging!(info, Type::Config, "Config regenerated successfully");
         handle::Handle::refresh_clash();
@@ -237,7 +230,7 @@ pub fn check_dns_config_exists() -> CmdResult<bool> {
     use crate::utils::dirs;
 
     let dns_path = dirs::app_home_dir()
-        .map_err(|e| e.to_string())?
+        .stringify_err()?
         .join("dns_config.yaml");
 
     Ok(dns_path.exists())
@@ -250,16 +243,14 @@ pub async fn get_dns_config_content() -> CmdResult<String> {
     use tokio::fs;
 
     let dns_path = dirs::app_home_dir()
-        .map_err(|e| e.to_string())?
+        .stringify_err()?
         .join("dns_config.yaml");
 
-    if !fs::try_exists(&dns_path).await.map_err(|e| e.to_string())? {
+    if !fs::try_exists(&dns_path).await.stringify_err()? {
         return Err("DNS config file not found".into());
     }
 
-    let content = fs::read_to_string(&dns_path)
-        .await
-        .map_err(|e| e.to_string())?;
+    let content = fs::read_to_string(&dns_path).await.stringify_err()?;
     Ok(content)
 }
 
@@ -268,21 +259,18 @@ pub async fn get_dns_config_content() -> CmdResult<String> {
 pub async fn validate_dns_config() -> CmdResult<(bool, String)> {
     use crate::{core::CoreManager, utils::dirs};
 
-    let app_dir = dirs::app_home_dir().map_err(|e| e.to_string())?;
+    let app_dir = dirs::app_home_dir().stringify_err()?;
     let dns_path = app_dir.join("dns_config.yaml");
     let dns_path_str = dns_path.to_str().unwrap_or_default();
 
     if !dns_path.exists() {
-        return Ok((false, "DNS config file not found".to_string()));
+        return Ok((false, "DNS config file not found".into()));
     }
 
-    match CoreManager::global()
+    Ok(CoreManager::global()
         .validate_config_file(dns_path_str, None)
         .await
-    {
-        Ok(result) => Ok(result),
-        Err(e) => Err(e.to_string()),
-    }
+        .stringify_err()?)
 }
 
 #[tauri::command]

src-tauri/src/cmd/mod.rs

@@ -35,3 +35,27 @@ pub use uwp::*;
 pub use validate::*;
 pub use verge::*;
 pub use webdav::*;
+
+pub trait StringifyErr<T> {
+    fn stringify_err(self) -> CmdResult<T>;
+    fn stringify_err_log<F>(self, log_fn: F) -> CmdResult<T>
+    where
+        F: Fn(&str);
+}
+
+impl<T, E: std::fmt::Display> StringifyErr<T> for Result<T, E> {
+    fn stringify_err(self) -> CmdResult<T> {
+        self.map_err(|e| e.to_string())
+    }
+
+    fn stringify_err_log<F>(self, log_fn: F) -> CmdResult<T>
+    where
+        F: Fn(&str),
+    {
+        self.map_err(|e| {
+            let msg = e.to_string();
+            log_fn(&msg);
+            msg
+        })
+    }
+}