From a86f22422b8ff753dd4ba5f2f0b39ca0d11f02d9 Mon Sep 17 00:00:00 2001 From: YoVinchen Date: Wed, 25 Feb 2026 22:15:49 +0800 Subject: [PATCH] style: fix clippy warnings and prettier formatting - Inline format args in openclaw_config.rs, webdav_sync.rs, archive.rs - Replace map_or(false, ..) with is_some_and(..) in live.rs - Fix prettier line-break formatting in claudeProviderPresets.ts --- src-tauri/src/openclaw_config.rs | 2 +- src-tauri/src/services/provider/live.rs | 2 +- src-tauri/src/services/webdav_sync.rs | 7 ++----- src-tauri/src/services/webdav_sync/archive.rs | 4 ++-- src/config/claudeProviderPresets.ts | 6 ++---- 5 files changed, 8 insertions(+), 13 deletions(-) diff --git a/src-tauri/src/openclaw_config.rs b/src-tauri/src/openclaw_config.rs index 20b18ccf9..39438184e 100644 --- a/src-tauri/src/openclaw_config.rs +++ b/src-tauri/src/openclaw_config.rs @@ -222,7 +222,7 @@ pub fn read_openclaw_config() -> Result { // 尝试 JSON5 解析（支持注释和尾随逗号） json5::from_str(&content) - .map_err(|e| AppError::Config(format!("Failed to parse OpenClaw config as JSON5: {}", e))) + .map_err(|e| AppError::Config(format!("Failed to parse OpenClaw config as JSON5: {e}"))) } /// 写入 OpenClaw 配置文件（原子写入） diff --git a/src-tauri/src/services/provider/live.rs b/src-tauri/src/services/provider/live.rs index 882191ad7..0f815c963 100644 --- a/src-tauri/src/services/provider/live.rs +++ b/src-tauri/src/services/provider/live.rs @@ -357,7 +357,7 @@ fn json_merge_patch(target: &mut Value, patch: &Value) { let entry = target_obj.entry(key.clone()).or_insert(json!({})); json_merge_patch(entry, value); // Clean up empty container objects - if entry.as_object().map_or(false, |o| o.is_empty()) { + if entry.as_object().is_some_and(|o| o.is_empty()) { target_obj.remove(key); } } else { diff --git a/src-tauri/src/services/webdav_sync.rs b/src-tauri/src/services/webdav_sync.rs index 6bdd6f4b0..13dfd3938 100644 --- a/src-tauri/src/services/webdav_sync.rs +++ b/src-tauri/src/services/webdav_sync.rs @@ -533,11 +533,8 @@ fn validate_artifact_size_limit(artifact_name: &str, size: u64) -> Result<(), Ap let max_mb = MAX_SYNC_ARTIFACT_BYTES / 1024 / 1024; return Err(localized( "webdav.sync.artifact_too_large", - format!("artifact {artifact_name} 超过下载上限（{} MB）", max_mb), - format!( - "Artifact {artifact_name} exceeds download limit ({} MB)", - max_mb - ), + format!("artifact {artifact_name} 超过下载上限（{max_mb} MB）"), + format!("Artifact {artifact_name} exceeds download limit ({max_mb} MB)"), )); } Ok(()) diff --git a/src-tauri/src/services/webdav_sync/archive.rs b/src-tauri/src/services/webdav_sync/archive.rs index aae5de1a8..6741c3832 100644 --- a/src-tauri/src/services/webdav_sync/archive.rs +++ b/src-tauri/src/services/webdav_sync/archive.rs @@ -350,8 +350,8 @@ fn copy_entry_with_total_limit( let max_mb = max_total_bytes / 1024 / 1024; return Err(localized( "webdav.sync.skills_zip_too_large", - format!("skills.zip 解压后体积超过上限（{} MB）", max_mb), - format!("skills.zip extracted size exceeds limit ({} MB)", max_mb), + format!("skills.zip 解压后体积超过上限（{max_mb} MB）"), + format!("skills.zip extracted size exceeds limit ({max_mb} MB)"), )); } diff --git a/src/config/claudeProviderPresets.ts b/src/config/claudeProviderPresets.ts index 80697e3eb..021d4211a 100644 --- a/src/config/claudeProviderPresets.ts +++ b/src/config/claudeProviderPresets.ts @@ -544,8 +544,7 @@ export const providerPresets: ProviderPreset[] = [ ANTHROPIC_MODEL: "global.anthropic.claude-opus-4-6-v1", ANTHROPIC_DEFAULT_HAIKU_MODEL: "global.anthropic.claude-haiku-4-5-20251001-v1:0", - ANTHROPIC_DEFAULT_SONNET_MODEL: - "global.anthropic.claude-sonnet-4-6", + ANTHROPIC_DEFAULT_SONNET_MODEL: "global.anthropic.claude-sonnet-4-6", ANTHROPIC_DEFAULT_OPUS_MODEL: "global.anthropic.claude-opus-4-6-v1", CLAUDE_CODE_USE_BEDROCK: "1", }, @@ -583,8 +582,7 @@ export const providerPresets: ProviderPreset[] = [ ANTHROPIC_MODEL: "global.anthropic.claude-opus-4-6-v1", ANTHROPIC_DEFAULT_HAIKU_MODEL: "global.anthropic.claude-haiku-4-5-20251001-v1:0", - ANTHROPIC_DEFAULT_SONNET_MODEL: - "global.anthropic.claude-sonnet-4-6", + ANTHROPIC_DEFAULT_SONNET_MODEL: "global.anthropic.claude-sonnet-4-6", ANTHROPIC_DEFAULT_OPUS_MODEL: "global.anthropic.claude-opus-4-6-v1", CLAUDE_CODE_USE_BEDROCK: "1", },