diff --git a/src-tauri/src/config/verge.rs b/src-tauri/src/config/verge.rs index 603fed2a4..9510228eb 100644 --- a/src-tauri/src/config/verge.rs +++ b/src-tauri/src/config/verge.rs @@ -296,7 +296,6 @@ impl IVerge { } /// 配置修正后重新加载配置 - fn reload_config_after_fix(updated_config: IVerge) -> Result<()> { use crate::config::Config; diff --git a/src-tauri/src/core/hotkey.rs b/src-tauri/src/core/hotkey.rs index b8f87d8fb..84f646d9c 100755 --- a/src-tauri/src/core/hotkey.rs +++ b/src-tauri/src/core/hotkey.rs @@ -330,9 +330,9 @@ impl Hotkey { let func = iter.next(); let key = iter.next(); - if func.is_some() && key.is_some() { - let func = func.unwrap().trim(); - let key = key.unwrap().trim(); + if let (Some(func), Some(key)) = (func, key) { + let func = func.trim(); + let key = key.trim(); map.insert(key, func); } });