Fix clippy warnings

haasonsaas · haasonsaas · commit 4615b3fb6b57 · 2025-12-27T20:37:58.000-08:00
diff --git a/src/adapters/llm.rs b/src/adapters/llm.rs
@@ -78,7 +78,7 @@ pub fn create_adapter(config: &ModelConfig) -> Result<Box<dyn LLMAdapter>> {
             if config
                 .base_url
                 .as_ref()
-                .map_or(false, |u| u.contains("11434")) =>
+                .is_some_and(|u| u.contains("11434")) =>
         {
             Ok(Box::new(crate::adapters::OllamaAdapter::new(
                 config.clone(),
diff --git a/src/config.rs b/src/config.rs
@@ -1,7 +1,7 @@
 use anyhow::Result;
 use serde::{Deserialize, Serialize};
 use std::collections::HashMap;
-use std::path::PathBuf;
+use std::path::{Path, PathBuf};
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct Config {
@@ -76,7 +76,7 @@ pub struct Config {
     pub paths: HashMap<String, PathConfig>,
 }
 
-#[derive(Debug, Clone, Serialize, Deserialize)]
+#[derive(Debug, Clone, Serialize, Deserialize, Default)]
 pub struct PathConfig {
     #[serde(default)]
     pub focus: Vec<String>,
@@ -107,19 +107,6 @@ pub struct PluginConfig {
     pub duplicate_filter: bool,
 }
 
-impl Default for PathConfig {
-    fn default() -> Self {
-        Self {
-            focus: Vec::new(),
-            ignore_patterns: Vec::new(),
-            extra_context: Vec::new(),
-            system_prompt: None,
-            review_instructions: None,
-            severity_overrides: HashMap::new(),
-        }
-    }
-}
-
 impl Default for Config {
     fn default() -> Self {
         Self {
@@ -257,7 +244,7 @@ impl Config {
         }
     }
 
-    pub fn get_path_config(&self, file_path: &PathBuf) -> Option<&PathConfig> {
+    pub fn get_path_config(&self, file_path: &Path) -> Option<&PathConfig> {
         let file_path_str = file_path.to_string_lossy();
 
         // Find the most specific matching path
@@ -275,7 +262,7 @@ impl Config {
         best_match.map(|(_, config)| config)
     }
 
-    pub fn should_exclude(&self, file_path: &PathBuf) -> bool {
+    pub fn should_exclude(&self, file_path: &Path) -> bool {
         let file_path_str = file_path.to_string_lossy();
 
         // Check global exclude patterns
diff --git a/src/core/changelog.rs b/src/core/changelog.rs
@@ -173,8 +173,6 @@ impl ChangelogGenerator {
                 ChangeType::Fix
             } else if first_line.to_lowercase().contains("add") {
                 ChangeType::Feature
-            } else if first_line.to_lowercase().contains("update") {
-                ChangeType::Chore
             } else {
                 ChangeType::Chore
             };
@@ -231,7 +229,7 @@ impl ChangelogGenerator {
             for entry in &breaking_changes {
                 output.push_str(&format!("* {}\n", entry.message));
             }
-            output.push_str("\n");
+            output.push('\n');
         }
 
         // Then by category
@@ -270,7 +268,7 @@ impl ChangelogGenerator {
                             ));
                         }
                     }
-                    output.push_str("\n");
+                    output.push('\n');
                 }
             }
         }
@@ -306,7 +304,7 @@ impl ChangelogGenerator {
         if breaking > 0 {
             output.push_str(&format!("- ⚠️  **Breaking Changes**: {}\n", breaking));
         }
-        output.push_str("\n");
+        output.push('\n');
 
         // Highlights (features and breaking changes)
         let feature_entries: Vec<_> = entries
@@ -319,7 +317,7 @@ impl ChangelogGenerator {
             for entry in feature_entries.iter().take(5) {
                 output.push_str(&format!("- {}\n", entry.message));
             }
-            output.push_str("\n");
+            output.push('\n');
         }
 
         // Breaking changes
@@ -330,7 +328,7 @@ impl ChangelogGenerator {
             for entry in &breaking_entries {
                 output.push_str(&format!("- {}\n", entry.message));
             }
-            output.push_str("\n");
+            output.push('\n');
         }
 
         // Bug fixes
@@ -344,7 +342,7 @@ impl ChangelogGenerator {
             for entry in fix_entries.iter().take(10) {
                 output.push_str(&format!("- {}\n", entry.message));
             }
-            output.push_str("\n");
+            output.push('\n');
         }
 
         // Contributors
diff --git a/src/core/comment.rs b/src/core/comment.rs
@@ -1,7 +1,7 @@
 use anyhow::Result;
 use serde::{Deserialize, Serialize};
 use std::collections::HashMap;
-use std::path::PathBuf;
+use std::path::{Path, PathBuf};
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct Comment {
@@ -130,7 +130,7 @@ impl CommentSynthesizer {
         let confidence = raw
             .confidence
             .unwrap_or_else(|| Self::calculate_confidence(&raw.content, &severity, &category));
-        let confidence = confidence.max(0.0).min(1.0);
+        let confidence = confidence.clamp(0.0, 1.0);
         let tags = if raw.tags.is_empty() {
             Self::extract_tags(&raw.content, &category)
         } else {
@@ -158,7 +158,7 @@ impl CommentSynthesizer {
         }))
     }
 
-    fn generate_comment_id(file_path: &PathBuf, content: &str, category: &Category) -> String {
+    fn generate_comment_id(file_path: &Path, content: &str, category: &Category) -> String {
         compute_comment_id(file_path, content, category)
     }
 
@@ -233,7 +233,7 @@ impl CommentSynthesizer {
         }
 
         // Ensure confidence stays in bounds
-        confidence.min(1.0).max(0.1)
+        confidence.clamp(0.1, 1.0)
     }
 
     fn extract_tags(content: &str, category: &Category) -> Vec<String> {
@@ -345,7 +345,7 @@ impl CommentSynthesizer {
             score -= penalty;
         }
 
-        score.max(0.0).min(10.0)
+        score.clamp(0.0, 10.0)
     }
 
     fn generate_recommendations(comments: &[Comment]) -> Vec<String> {
@@ -395,7 +395,7 @@ impl CommentSynthesizer {
         });
     }
 
-    fn sort_by_priority(comments: &mut Vec<Comment>) {
+    fn sort_by_priority(comments: &mut [Comment]) {
         comments.sort_by_key(|c| {
             let severity_priority = match c.severity {
                 Severity::Error => 0,
@@ -424,7 +424,7 @@ impl CommentSynthesizer {
     }
 }
 
-pub fn compute_comment_id(file_path: &PathBuf, content: &str, category: &Category) -> String {
+pub fn compute_comment_id(file_path: &Path, content: &str, category: &Category) -> String {
     let normalized = normalize_content(content);
     let key = format!("{}|{:?}|{}", file_path.display(), category, normalized);
     let hash = fnv1a64(key.as_bytes());
diff --git a/src/core/context.rs b/src/core/context.rs
@@ -89,11 +89,9 @@ impl ContextFetcher {
             };
 
             if let Ok(entries) = glob(&pattern_path) {
-                for entry in entries {
-                    if let Ok(path) = entry {
-                        if path.is_file() {
-                            matched_paths.insert(path);
-                        }
+                for path in entries.flatten() {
+                    if path.is_file() {
+                        matched_paths.insert(path);
                     }
                 }
             }
diff --git a/src/core/interactive.rs b/src/core/interactive.rs
@@ -58,7 +58,7 @@ impl InteractiveCommand {
 
     pub async fn execute(
         &self,
-        adapter: &Box<dyn LLMAdapter>,
+        adapter: &dyn LLMAdapter,
         diff_content: Option<&str>,
     ) -> Result<String> {
         match &self.command {
@@ -73,7 +73,7 @@ impl InteractiveCommand {
 
     async fn execute_review(
         &self,
-        adapter: &Box<dyn LLMAdapter>,
+        adapter: &dyn LLMAdapter,
         diff_content: Option<&str>,
     ) -> Result<String> {
         if let Some(diff) = diff_content {
@@ -116,7 +116,7 @@ impl InteractiveCommand {
 
     async fn execute_explain(
         &self,
-        adapter: &Box<dyn LLMAdapter>,
+        adapter: &dyn LLMAdapter,
         diff_content: Option<&str>,
     ) -> Result<String> {
         let context = if self.args.is_empty() {
@@ -143,7 +143,7 @@ impl InteractiveCommand {
         Ok(format!("## 💡 Explanation\n\n{}", response.content))
     }
 
-    async fn execute_generate(&self, adapter: &Box<dyn LLMAdapter>) -> Result<String> {
+    async fn execute_generate(&self, adapter: &dyn LLMAdapter) -> Result<String> {
         if self.args.is_empty() {
             return Ok(
                 "Please specify what to generate (e.g., @diffscope generate tests)".to_string(),
diff --git a/src/core/pr_summary.rs b/src/core/pr_summary.rs
@@ -4,33 +4,25 @@ use anyhow::Result;
 
 pub struct PRSummaryGenerator;
 
-#[derive(Debug, Clone)]
+#[derive(Debug, Clone, Default)]
 pub struct SummaryOptions {
     pub include_diagram: bool,
 }
 
-impl Default for SummaryOptions {
-    fn default() -> Self {
-        Self {
-            include_diagram: false,
-        }
-    }
-}
-
 impl PRSummaryGenerator {
     #[allow(dead_code)]
     pub async fn generate_summary(
         diffs: &[UnifiedDiff],
         git: &GitIntegration,
-        adapter: &Box<dyn LLMAdapter>,
+        adapter: &dyn LLMAdapter,
     ) -> Result<PRSummary> {
         Self::generate_summary_with_options(diffs, git, adapter, SummaryOptions::default()).await
     }
 
     pub async fn generate_summary_with_options(
         diffs: &[UnifiedDiff],
         git: &GitIntegration,
-        adapter: &Box<dyn LLMAdapter>,
+        adapter: &dyn LLMAdapter,
         options: SummaryOptions,
     ) -> Result<PRSummary> {
         // Get commit messages for context
@@ -57,7 +49,7 @@ impl PRSummaryGenerator {
 
     pub async fn generate_change_diagram(
         diffs: &[UnifiedDiff],
-        adapter: &Box<dyn LLMAdapter>,
+        adapter: &dyn LLMAdapter,
     ) -> Result<Option<String>> {
         let stats = Self::calculate_stats(diffs);
         let prompt = Self::build_diagram_prompt(diffs, &stats);
@@ -133,7 +125,7 @@ impl PRSummaryGenerator {
         prompt.push_str("Generate a comprehensive PR summary based on the following changes:\n\n");
 
         // Add statistics
-        prompt.push_str(&format!("## Statistics\n"));
+        prompt.push_str("## Statistics\n");
         prompt.push_str(&format!("- Files changed: {}\n", stats.files_changed));
         prompt.push_str(&format!("- Lines added: {}\n", stats.lines_added));
         prompt.push_str(&format!("- Lines removed: {}\n", stats.lines_removed));
@@ -147,7 +139,7 @@ impl PRSummaryGenerator {
             for commit in commits.iter().take(5) {
                 prompt.push_str(&format!("- {}\n", commit));
             }
-            prompt.push_str("\n");
+            prompt.push('\n');
         }
 
         // Add file changes summary
@@ -376,7 +368,7 @@ impl PRSummary {
             for change in &self.key_changes {
                 output.push_str(&format!("- {}\n", change));
             }
-            output.push_str("\n");
+            output.push('\n');
         }
 
         // Statistics
@@ -406,7 +398,7 @@ impl PRSummary {
                 self.stats.doc_files
             ));
         }
-        output.push_str("\n");
+        output.push('\n');
 
         // Breaking changes
         if let Some(breaking) = &self.breaking_changes {
@@ -444,15 +436,15 @@ fn extract_mermaid_diagram(content: &str) -> Option<String> {
             }
 
             // Seek to mermaid block
-            while let Some(next_line) = lines.next() {
+            for next_line in lines.by_ref() {
                 let next_trimmed = next_line.trim();
                 if next_trimmed.starts_with("```") && next_trimmed.contains("mermaid") {
                     break;
                 }
             }
 
             let mut diagram_lines = Vec::new();
-            while let Some(block_line) = lines.next() {
+            for block_line in lines.by_ref() {
                 let block_trimmed = block_line.trim();
                 if block_trimmed.starts_with("```") {
                     break;
diff --git a/src/core/smart_review_prompt.rs b/src/core/smart_review_prompt.rs
@@ -106,9 +106,9 @@ TAGS: [comma-separated relevant tags]
             for chunk in context_chunks {
                 let (start_line, end_line) = chunk.line_range.unwrap_or((1, 1));
                 let description = format!(
-                    "{} - {}",
+                    "{} - {:?}",
                     chunk.file_path.display(),
-                    format!("{:?}", chunk.context_type)
+                    chunk.context_type
                 );
                 let block = format!(
                     "**{}** (lines {}-{}):\n```\n{}\n```\n\n",
diff --git a/src/core/symbol_index.rs b/src/core/symbol_index.rs
diff --git a/src/main.rs b/src/main.rs

Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ pub fn create_adapter(config: &ModelConfig) -> Result<Box<dyn LLMAdapter>> {`
`78`	`78`	`if config`
`79`	`79`	`.base_url`
`80`	`80`	`.as_ref()`
`81`		`- .map_or(false, \|u\| u.contains("11434")) =>`
	`81`	`+ .is_some_and(\|u\| u.contains("11434")) =>`
`82`	`82`	`{`
`83`	`83`	`Ok(Box::new(crate::adapters::OllamaAdapter::new(`
`84`	`84`	`config.clone(),`
Original file line number	Diff line number	Diff line change
`@@ -173,8 +173,6 @@ impl ChangelogGenerator {`
`173`	`173`	`ChangeType::Fix`
`174`	`174`	`} else if first_line.to_lowercase().contains("add") {`
`175`	`175`	`ChangeType::Feature`
`176`		`- } else if first_line.to_lowercase().contains("update") {`
`177`		`- ChangeType::Chore`
`178`	`176`	`} else {`
`179`	`177`	`ChangeType::Chore`
`180`	`178`	`};`
`@@ -231,7 +229,7 @@ impl ChangelogGenerator {`
`231`	`229`	`for entry in &breaking_changes {`
`232`	`230`	`output.push_str(&format!("* {}\n", entry.message));`
`233`	`231`	`}`
`234`		`- output.push_str("\n");`
	`232`	`+ output.push('\n');`
`235`	`233`	`}`
`236`	`234`
`237`	`235`	`// Then by category`
`@@ -270,7 +268,7 @@ impl ChangelogGenerator {`
`270`	`268`	`));`
`271`	`269`	`}`
`272`	`270`	`}`
`273`		`- output.push_str("\n");`
	`271`	`+ output.push('\n');`
`274`	`272`	`}`
`275`	`273`	`}`
`276`	`274`	`}`
`@@ -306,7 +304,7 @@ impl ChangelogGenerator {`
`306`	`304`	`if breaking > 0 {`
`307`	`305`	`output.push_str(&format!("- ⚠️ Breaking Changes: {}\n", breaking));`
`308`	`306`	`}`
`309`		`- output.push_str("\n");`
	`307`	`+ output.push('\n');`
`310`	`308`
`311`	`309`	`// Highlights (features and breaking changes)`
`312`	`310`	`let feature_entries: Vec<_> = entries`
`@@ -319,7 +317,7 @@ impl ChangelogGenerator {`
`319`	`317`	`for entry in feature_entries.iter().take(5) {`
`320`	`318`	`output.push_str(&format!("- {}\n", entry.message));`
`321`	`319`	`}`
`322`		`- output.push_str("\n");`
	`320`	`+ output.push('\n');`
`323`	`321`	`}`
`324`	`322`
`325`	`323`	`// Breaking changes`
`@@ -330,7 +328,7 @@ impl ChangelogGenerator {`
`330`	`328`	`for entry in &breaking_entries {`
`331`	`329`	`output.push_str(&format!("- {}\n", entry.message));`
`332`	`330`	`}`
`333`		`- output.push_str("\n");`
	`331`	`+ output.push('\n');`
`334`	`332`	`}`
`335`	`333`
`336`	`334`	`// Bug fixes`
`@@ -344,7 +342,7 @@ impl ChangelogGenerator {`
`344`	`342`	`for entry in fix_entries.iter().take(10) {`
`345`	`343`	`output.push_str(&format!("- {}\n", entry.message));`
`346`	`344`	`}`
`347`		`- output.push_str("\n");`
	`345`	`+ output.push('\n');`
`348`	`346`	`}`
`349`	`347`
`350`	`348`	`// Contributors`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`use anyhow::Result;`
`2`	`2`	`use serde::{Deserialize, Serialize};`
`3`	`3`	`use std::collections::HashMap;`
`4`		`-use std::path::PathBuf;`
	`4`	`+use std::path::{Path, PathBuf};`
`5`	`5`
`6`	`6`	`#[derive(Debug, Clone, Serialize, Deserialize)]`
`7`	`7`	`pub struct Comment {`
`@@ -130,7 +130,7 @@ impl CommentSynthesizer {`
`130`	`130`	`let confidence = raw`
`131`	`131`	`.confidence`
`132`	`132`	`.unwrap_or_else(\|\| Self::calculate_confidence(&raw.content, &severity, &category));`
`133`		`- let confidence = confidence.max(0.0).min(1.0);`
	`133`	`+ let confidence = confidence.clamp(0.0, 1.0);`
`134`	`134`	`let tags = if raw.tags.is_empty() {`
`135`	`135`	`Self::extract_tags(&raw.content, &category)`
`136`	`136`	`} else {`
`@@ -158,7 +158,7 @@ impl CommentSynthesizer {`
`158`	`158`	`}))`
`159`	`159`	`}`
`160`	`160`
`161`		`- fn generate_comment_id(file_path: &PathBuf, content: &str, category: &Category) -> String {`
	`161`	`+ fn generate_comment_id(file_path: &Path, content: &str, category: &Category) -> String {`
`162`	`162`	`compute_comment_id(file_path, content, category)`
`163`	`163`	`}`
`164`	`164`
`@@ -233,7 +233,7 @@ impl CommentSynthesizer {`
`233`	`233`	`}`
`234`	`234`
`235`	`235`	`// Ensure confidence stays in bounds`
`236`		`- confidence.min(1.0).max(0.1)`
	`236`	`+ confidence.clamp(0.1, 1.0)`
`237`	`237`	`}`
`238`	`238`
`239`	`239`	`fn extract_tags(content: &str, category: &Category) -> Vec<String> {`
`@@ -345,7 +345,7 @@ impl CommentSynthesizer {`
`345`	`345`	`score -= penalty;`
`346`	`346`	`}`
`347`	`347`
`348`		`- score.max(0.0).min(10.0)`
	`348`	`+ score.clamp(0.0, 10.0)`
`349`	`349`	`}`
`350`	`350`
`351`	`351`	`fn generate_recommendations(comments: &[Comment]) -> Vec<String> {`
`@@ -395,7 +395,7 @@ impl CommentSynthesizer {`
`395`	`395`	`});`
`396`	`396`	`}`
`397`	`397`
`398`		`- fn sort_by_priority(comments: &mut Vec<Comment>) {`
	`398`	`+ fn sort_by_priority(comments: &mut [Comment]) {`
`399`	`399`	`comments.sort_by_key(\|c\| {`
`400`	`400`	`let severity_priority = match c.severity {`
`401`	`401`	`Severity::Error => 0,`
`@@ -424,7 +424,7 @@ impl CommentSynthesizer {`
`424`	`424`	`}`
`425`	`425`	`}`
`426`	`426`
`427`		`-pub fn compute_comment_id(file_path: &PathBuf, content: &str, category: &Category) -> String {`
	`427`	`+pub fn compute_comment_id(file_path: &Path, content: &str, category: &Category) -> String {`
`428`	`428`	`let normalized = normalize_content(content);`
`429`	`429`	`let key = format!("{}\|{:?}\|{}", file_path.display(), category, normalized);`
`430`	`430`	`let hash = fnv1a64(key.as_bytes());`
Original file line number	Diff line number	Diff line change
`@@ -89,11 +89,9 @@ impl ContextFetcher {`
`89`	`89`	`};`
`90`	`90`
`91`	`91`	`if let Ok(entries) = glob(&pattern_path) {`
`92`		`- for entry in entries {`
`93`		`- if let Ok(path) = entry {`
`94`		`- if path.is_file() {`
`95`		`- matched_paths.insert(path);`
`96`		`- }`
	`92`	`+ for path in entries.flatten() {`
	`93`	`+ if path.is_file() {`
	`94`	`+ matched_paths.insert(path);`
`97`	`95`	`}`
`98`	`96`	`}`
`99`	`97`	`}`