fix(lint): resolve 9 Rust 1.95 clippy errors (v0.9.1)

sdsrss · claude · sdsrss · commit 5a64b398fe0f · 2026-04-17T02:26:51.000+08:00
Pre-existing lints surfaced by stricter 1.95 clippy (CI has been red since
~v0.8.1; local toolchain was 1.91). No runtime behavior change.

- collapsible_match (4): merge `match arm =&gt; if cond` into `match arm if cond =&gt;`
  in src/parser/relations.rs C# arms + Python decorator scan
- unnecessary_sort_by (4): sort_by(|a,b| b.x.cmp(&amp;a.x)) → sort_by_key(|e| Reverse(e.x))
  in src/mcp/server/tools.rs and src/storage/queries.rs
- useless_conversion (1): drop redundant .into_iter() in src/graph/query.rs:133

Verified: cargo +1.95.0 clippy -- -D warnings clean on both feature sets;
328 cargo tests pass --no-default-features.

Co-Authored-By: Claude Opus 4.7 (1M context) &lt;noreply@anthropic.com&gt;
diff --git a/.claude-plugin/marketplace.json b/.claude-plugin/marketplace.json
@@ -5,14 +5,14 @@
   },
   "metadata": {
     "description": "AST knowledge graph plugin for Claude Code — semantic search, call graph, HTTP tracing, impact analysis",
-    "version": "0.9.0"
+    "version": "0.9.1"
   },
   "plugins": [
     {
       "name": "code-graph-mcp",
       "source": "./claude-plugin",
       "description": "AST knowledge graph for intelligent code navigation — auto-indexes your codebase and provides semantic search, call graph traversal, HTTP route tracing, and impact analysis via MCP tools",
-      "version": "0.9.0",
+      "version": "0.9.1",
       "author": {
         "name": "sdsrs"
       },
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,15 @@
 # Changelog
 
+## v0.9.1 — Rust 1.95 clippy cleanup
+
+CI-only cleanup; no runtime behavior changes, no user-visible differences. Fixes 9 clippy errors surfaced by Rust 1.95.0's stricter lints (pre-existing since ~v0.8.1, was shipping with red CI):
+
+- `collapsible_match` (4): merge `match arm => if cond` into `match arm if cond =>` in `src/parser/relations.rs` C# arms + Python decorator scan.
+- `unnecessary_sort_by` (4): `.sort_by(|a,b| b.x.cmp(&a.x))` → `.sort_by_key(|e| Reverse(e.x))` in `src/mcp/server/tools.rs` and `src/storage/queries.rs`.
+- `useless_conversion` (1): drop redundant `.into_iter()` in a chained iterator in `src/graph/query.rs`.
+
+Verified with `cargo +1.95.0 clippy -- -D warnings` on both `--no-default-features` and default feature sets.
+
 ## v0.9.0 — Context-aware auto-adopt (C')
 
 ### Migration note
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "code-graph-mcp"
-version = "0.9.0"
+version = "0.9.1"
 edition = "2021"
 
 [features]
diff --git a/claude-plugin/.claude-plugin/plugin.json b/claude-plugin/.claude-plugin/plugin.json
@@ -4,7 +4,7 @@
   "author": {
     "name": "sdsrs"
   },
-  "version": "0.9.0",
+  "version": "0.9.1",
   "keywords": [
     "code-graph",
     "ast",
diff --git a/npm/darwin-arm64/package.json b/npm/darwin-arm64/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sdsrs/code-graph-darwin-arm64",
-  "version": "0.9.0",
+  "version": "0.9.1",
   "description": "code-graph-mcp binary for macOS ARM64",
   "license": "MIT",
   "repository": {
diff --git a/npm/darwin-x64/package.json b/npm/darwin-x64/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sdsrs/code-graph-darwin-x64",
-  "version": "0.9.0",
+  "version": "0.9.1",
   "description": "code-graph-mcp binary for macOS x64",
   "license": "MIT",
   "repository": {
diff --git a/npm/linux-arm64/package.json b/npm/linux-arm64/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sdsrs/code-graph-linux-arm64",
-  "version": "0.9.0",
+  "version": "0.9.1",
   "description": "code-graph-mcp binary for Linux ARM64",
   "license": "MIT",
   "repository": {
diff --git a/npm/linux-x64/package.json b/npm/linux-x64/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sdsrs/code-graph-linux-x64",
-  "version": "0.9.0",
+  "version": "0.9.1",
   "description": "code-graph-mcp binary for Linux x64",
   "license": "MIT",
   "repository": {
diff --git a/npm/win32-x64/package.json b/npm/win32-x64/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sdsrs/code-graph-win32-x64",
-  "version": "0.9.0",
+  "version": "0.9.1",
   "description": "code-graph-mcp binary for Windows x64",
   "license": "MIT",
   "repository": {
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sdsrs/code-graph",
-  "version": "0.9.0",
+  "version": "0.9.1",
   "description": "MCP server that indexes codebases into an AST knowledge graph with semantic search, call graph traversal, and HTTP route tracing",
   "license": "MIT",
   "repository": {
@@ -34,10 +34,10 @@
     "node": ">=16"
   },
   "optionalDependencies": {
-    "@sdsrs/code-graph-linux-x64": "0.9.0",
-    "@sdsrs/code-graph-linux-arm64": "0.9.0",
-    "@sdsrs/code-graph-darwin-x64": "0.9.0",
-    "@sdsrs/code-graph-darwin-arm64": "0.9.0",
-    "@sdsrs/code-graph-win32-x64": "0.9.0"
+    "@sdsrs/code-graph-linux-x64": "0.9.1",
+    "@sdsrs/code-graph-linux-arm64": "0.9.1",
+    "@sdsrs/code-graph-darwin-x64": "0.9.1",
+    "@sdsrs/code-graph-darwin-arm64": "0.9.1",
+    "@sdsrs/code-graph-win32-x64": "0.9.1"
   }
 }
diff --git a/src/graph/query.rs b/src/graph/query.rs
@@ -130,7 +130,7 @@ fn query_direction(
 fn merge_results(callees: Vec<CallGraphNode>, callers: Vec<CallGraphNode>) -> Vec<CallGraphNode> {
     let mut by_key: HashMap<(i64, Direction), CallGraphNode> = HashMap::new();
 
-    for node in callees.into_iter().chain(callers.into_iter()) {
+    for node in callees.into_iter().chain(callers) {
         let key = (node.node_id, node.direction);
         by_key
             .entry(key)
diff --git a/src/mcp/server/tools.rs b/src/mcp/server/tools.rs
@@ -1189,7 +1189,7 @@ impl McpServer {
         let mut hot_candidates: Vec<_> = exports.iter()
             .filter(|e| e.caller_count > 0)
             .collect();
-        hot_candidates.sort_by(|a, b| b.caller_count.cmp(&a.caller_count));
+        hot_candidates.sort_by_key(|e| std::cmp::Reverse(e.caller_count));
         let hot_paths: Vec<serde_json::Value> = hot_candidates.iter()
             .take(5)
             .map(|e| json!({
@@ -1204,7 +1204,7 @@ impl McpServer {
         const MAX_ACTIVE: usize = 30;
         let active_capped = active.len() > MAX_ACTIVE;
         let mut active_sorted = active.clone();
-        active_sorted.sort_by(|a, b| b.caller_count.cmp(&a.caller_count));
+        active_sorted.sort_by_key(|e| std::cmp::Reverse(e.caller_count));
         let active_exports: Vec<serde_json::Value> = active_sorted.iter()
             .take(MAX_ACTIVE)
             .map(|e| json!({
diff --git a/src/parser/relations.rs b/src/parser/relations.rs
@@ -403,80 +403,74 @@ fn walk_for_relations(
         }
 
         // C# using directives: using System; using System.Collections.Generic;
-        "using_directive" => {
-            if config.name == "csharp" {
-                for i in 0..node.named_child_count() {
-                    if let Some(child) = node.named_child(i) {
-                        if child.kind() == "qualified_name" || child.kind() == "identifier" {
-                            let name = node_text(&child, source).to_string();
-                            if !name.is_empty() && name != "using" {
-                                results.push(ParsedRelation {
-                                    source_name: "<module>".into(),
-                                    target_name: name,
-                                    relation: REL_IMPORTS.into(),
-                                    metadata: None,
-                                });
-                            }
+        "using_directive" if config.name == "csharp" => {
+            for i in 0..node.named_child_count() {
+                if let Some(child) = node.named_child(i) {
+                    if child.kind() == "qualified_name" || child.kind() == "identifier" {
+                        let name = node_text(&child, source).to_string();
+                        if !name.is_empty() && name != "using" {
+                            results.push(ParsedRelation {
+                                source_name: "<module>".into(),
+                                target_name: name,
+                                relation: REL_IMPORTS.into(),
+                                metadata: None,
+                            });
                         }
                     }
                 }
             }
         }
 
         // C# inheritance: class Dog : Animal, IWalkable
-        "base_list" => {
-            if config.name == "csharp" {
-                // Get the class/struct name from the parent node
-                let owner_name = node.parent()
-                    .and_then(|p| p.child_by_field_name("name"))
-                    .map(|n| node_text(&n, source).to_string());
-                let owner = owner_name.as_deref().or(active_scope).unwrap_or("<module>");
-                for i in 0..node.named_child_count() {
-                    if let Some(child) = node.named_child(i) {
-                        let base_name = node_text(&child, source).to_string();
-                        if !base_name.is_empty() {
-                            let rel = if config.interface_by_prefix
-                                && base_name.starts_with('I') && base_name.len() > 1
-                                && base_name.chars().nth(1).map(|c| c.is_uppercase()).unwrap_or(false) {
-                                REL_IMPLEMENTS
-                            } else {
-                                REL_INHERITS
-                            };
-                            results.push(ParsedRelation {
-                                source_name: owner.to_string(),
-                                target_name: base_name,
-                                relation: rel.into(),
-                                metadata: None,
-                            });
-                        }
+        "base_list" if config.name == "csharp" => {
+            // Get the class/struct name from the parent node
+            let owner_name = node.parent()
+                .and_then(|p| p.child_by_field_name("name"))
+                .map(|n| node_text(&n, source).to_string());
+            let owner = owner_name.as_deref().or(active_scope).unwrap_or("<module>");
+            for i in 0..node.named_child_count() {
+                if let Some(child) = node.named_child(i) {
+                    let base_name = node_text(&child, source).to_string();
+                    if !base_name.is_empty() {
+                        let rel = if config.interface_by_prefix
+                            && base_name.starts_with('I') && base_name.len() > 1
+                            && base_name.chars().nth(1).map(|c| c.is_uppercase()).unwrap_or(false) {
+                            REL_IMPLEMENTS
+                        } else {
+                            REL_INHERITS
+                        };
+                        results.push(ParsedRelation {
+                            source_name: owner.to_string(),
+                            target_name: base_name,
+                            relation: rel.into(),
+                            metadata: None,
+                        });
                     }
                 }
             }
         }
 
         // C# method/function calls: invocation_expression (Console.WriteLine(...), Baz(), etc.)
-        "invocation_expression" => {
-            if config.name == "csharp" {
-                if let Some(scope) = active_scope {
-                    if let Some(func) = node.named_child(0) {
-                        let callee = match func.kind() {
-                            "identifier" => Some(node_text(&func, source).to_string()),
-                            "member_access_expression" => {
-                                // e.g. Console.WriteLine — extract "WriteLine"
-                                func.child_by_field_name("name")
-                                    .map(|n| node_text(&n, source).to_string())
-                            }
-                            _ => None,
-                        };
-                        if let Some(name) = callee {
-                            if !name.is_empty() {
-                                results.push(ParsedRelation {
-                                    source_name: scope.to_string(),
-                                    target_name: name,
-                                    relation: REL_CALLS.into(),
-                                    metadata: None,
-                                });
-                            }
+        "invocation_expression" if config.name == "csharp" => {
+            if let Some(scope) = active_scope {
+                if let Some(func) = node.named_child(0) {
+                    let callee = match func.kind() {
+                        "identifier" => Some(node_text(&func, source).to_string()),
+                        "member_access_expression" => {
+                            // e.g. Console.WriteLine — extract "WriteLine"
+                            func.child_by_field_name("name")
+                                .map(|n| node_text(&n, source).to_string())
+                        }
+                        _ => None,
+                    };
+                    if let Some(name) = callee {
+                        if !name.is_empty() {
+                            results.push(ParsedRelation {
+                                source_name: scope.to_string(),
+                                target_name: name,
+                                relation: REL_CALLS.into(),
+                                metadata: None,
+                            });
                         }
                     }
                 }
@@ -1259,14 +1253,12 @@ fn extract_python_route(node: &tree_sitter::Node, source: &str) -> Option<Parsed
     for i in 0..node.named_child_count() {
         if let Some(child) = node.named_child(i) {
             match child.kind() {
-                "decorator" => {
-                    if matched_decorator.is_none() {
-                        let dec_text = node_text(&child, source);
-                        let has_receiver = known_receivers.iter().any(|p| dec_text.contains(p));
-                        let has_method = route_methods.iter().any(|m| dec_text.contains(m));
-                        if has_receiver && has_method {
-                            matched_decorator = Some(child);
-                        }
+                "decorator" if matched_decorator.is_none() => {
+                    let dec_text = node_text(&child, source);
+                    let has_receiver = known_receivers.iter().any(|p| dec_text.contains(p));
+                    let has_method = route_methods.iter().any(|m| dec_text.contains(m));
+                    if has_receiver && has_method {
+                        matched_decorator = Some(child);
                     }
                 }
                 "function_definition" => func_def = Some(child),
diff --git a/src/storage/queries.rs b/src/storage/queries.rs
@@ -1482,7 +1482,7 @@ pub fn get_project_map(conn: &Connection) -> Result<(Vec<ModuleStats>, Vec<Modul
             key_symbols: dir_symbols.remove(dir).unwrap_or_default(),
         }
     }).collect();
-    modules.sort_by(|a, b| b.functions.cmp(&a.functions));
+    modules.sort_by_key(|m| std::cmp::Reverse(m.functions));
 
     // 3. Cross-module dependencies (C3: use REL_IMPORTS constant)
     let mut dep_map: HashMap<(String, String), usize> = HashMap::new();
@@ -1511,7 +1511,7 @@ pub fn get_project_map(conn: &Connection) -> Result<(Vec<ModuleStats>, Vec<Modul
     let mut deps: Vec<ModuleDep> = dep_map.into_iter()
         .map(|((from, to), count)| ModuleDep { from, to, import_count: count })
         .collect();
-    deps.sort_by(|a, b| b.import_count.cmp(&a.import_count));
+    deps.sort_by_key(|d| std::cmp::Reverse(d.import_count));
 
     // 4. HTTP entry points (C3: use REL_ROUTES_TO constant)
     let mut entry_points = Vec::new();

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@sdsrs/code-graph-darwin-arm64",`
`3`		`- "version": "0.9.0",`
	`3`	`+ "version": "0.9.1",`
`4`	`4`	`"description": "code-graph-mcp binary for macOS ARM64",`
`5`	`5`	`"license": "MIT",`
`6`	`6`	`"repository": {`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@sdsrs/code-graph-darwin-x64",`
`3`		`- "version": "0.9.0",`
	`3`	`+ "version": "0.9.1",`
`4`	`4`	`"description": "code-graph-mcp binary for macOS x64",`
`5`	`5`	`"license": "MIT",`
`6`	`6`	`"repository": {`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@sdsrs/code-graph-linux-arm64",`
`3`		`- "version": "0.9.0",`
	`3`	`+ "version": "0.9.1",`
`4`	`4`	`"description": "code-graph-mcp binary for Linux ARM64",`
`5`	`5`	`"license": "MIT",`
`6`	`6`	`"repository": {`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@sdsrs/code-graph-linux-x64",`
`3`		`- "version": "0.9.0",`
	`3`	`+ "version": "0.9.1",`
`4`	`4`	`"description": "code-graph-mcp binary for Linux x64",`
`5`	`5`	`"license": "MIT",`
`6`	`6`	`"repository": {`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@sdsrs/code-graph-win32-x64",`
`3`		`- "version": "0.9.0",`
	`3`	`+ "version": "0.9.1",`
`4`	`4`	`"description": "code-graph-mcp binary for Windows x64",`
`5`	`5`	`"license": "MIT",`
`6`	`6`	`"repository": {`