fix: cargo fmt + clippy regex_creation_in_loops

This commit is contained in:
晴天
2026-03-07 19:41:16 +08:00
parent 0752dc2a71
commit 1bd94143b5
2 changed files with 18 additions and 7 deletions

View File

@@ -390,18 +390,18 @@ pub async fn assistant_web_search(
r#"class="result__a"[^>]*href="([^"]*)"[^>]*>([\s\S]*?)</a>[\s\S]*?class="result__snippet"[^>]*>([\s\S]*?)</a>"#
).unwrap();
let re_strip_tags = regex::Regex::new(r"<[^>]+>").unwrap();
for cap in re_result.captures_iter(&html) {
if results.len() >= max {
break;
}
let raw_url = &cap[1];
let title = regex::Regex::new(r"<[^>]+>")
.unwrap()
let title = re_strip_tags
.replace_all(&cap[2], "")
.trim()
.to_string();
let snippet = regex::Regex::new(r"<[^>]+>")
.unwrap()
let snippet = re_strip_tags
.replace_all(&cap[3], "")
.trim()
.to_string();

View File

@@ -591,12 +591,23 @@ pub async fn upgrade_openclaw(app: tauri::AppHandle, source: String) -> Result<S
let _ = app.emit("upgrade-progress", 100);
if !status.success() {
let code = status.code().map(|c| c.to_string()).unwrap_or("unknown".into());
let code = status
.code()
.map(|c| c.to_string())
.unwrap_or("unknown".into());
let _ = app.emit("upgrade-log", format!("❌ 升级失败 (exit code: {code})"));
// 把 stderr 最后 15 行带进错误消息,确保前端诊断函数能匹配到
// npm 内部错误码(如 -4058 ENOENT、EPERM 等)
let tail = stderr_lines.lock().unwrap()
.iter().rev().take(15).rev().cloned().collect::<Vec<_>>().join("\n");
let tail = stderr_lines
.lock()
.unwrap()
.iter()
.rev()
.take(15)
.rev()
.cloned()
.collect::<Vec<_>>()
.join("\n");
return Err(format!("升级失败exit code: {code}\n{tail}"));
}