From 1b0ee6a18d69b3b72b48aa96dd2e46ca511df07b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=99=B4=E5=A4=A9?= <keh5@vip.qq.com>
Date: Tue, 7 Apr 2026 03:34:56 +0800
Subject: [PATCH] fix: clippy manual_flatten in skills.rs

---
 src-tauri/src/commands/skills.rs | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/src-tauri/src/commands/skills.rs b/src-tauri/src/commands/skills.rs
index 0b29c01..ac5308c 100644
--- a/src-tauri/src/commands/skills.rs
+++ b/src-tauri/src/commands/skills.rs
@@ -463,13 +463,14 @@ fn custom_skill_roots() -> Vec<(std::path::PathBuf, &'static str)> {
         let cli = std::path::PathBuf::from(&cli_path);
         let cli = std::fs::canonicalize(&cli).unwrap_or(cli);
         // CLI 可能在 bin/ 子目录或包根目录
-        for ancestor in [cli.parent(), cli.parent().and_then(|p| p.parent())] {
-            if let Some(pkg_root) = ancestor {
-                let bundled = pkg_root.join("skills");
-                if bundled.is_dir() && !roots.iter().any(|(dir, _)| dir == &bundled) {
-                    roots.push((bundled, "OpenClaw 内置"));
-                    break;
-                }
+        for pkg_root in [cli.parent(), cli.parent().and_then(|p| p.parent())]
+            .into_iter()
+            .flatten()
+        {
+            let bundled = pkg_root.join("skills");
+            if bundled.is_dir() && !roots.iter().any(|(dir, _)| dir == &bundled) {
+                roots.push((bundled, "OpenClaw 内置"));
+                break;
             }
         }
     }