fix lint warnings

acunniffe · acunniffe · commit 098b29793e31 · 2025-09-29T15:12:09.000+02:00
diff --git a/src/commands/checkpoint_agent/agent_preset.rs b/src/commands/checkpoint_agent/agent_preset.rs
@@ -693,7 +693,7 @@ impl CursorPreset {
         Ok(None)
     }
 
-    fn explore_database_for_model_info(
+    fn _explore_database_for_model_info(
         global_db_path: &Path,
         composer_id: &str,
     ) -> Result<(), GitAiError> {
@@ -807,7 +807,7 @@ impl CursorPreset {
                         // Check toolFormerData for model information
                         if let Some(tool_former_data) = bubble_content.get("toolFormerData") {
                             // Look for model information in the toolFormerData
-                            if let Some(model_call_id) = tool_former_data.get("modelCallId") {
+                            if let Some(_model_call_id) = tool_former_data.get("modelCallId") {
                                 // The presence of modelCallId suggests this is an AI interaction
                                 // We can infer the model from other context or use a default
                                 return Ok("claude-3.5-sonnet".to_string()); // Default for Cursor AI interactions
diff --git a/src/commands/install_hooks.rs b/src/commands/install_hooks.rs
@@ -1,6 +1,6 @@
 use crate::error::GitAiError;
 use indicatif::{ProgressBar, ProgressStyle};
-use serde_json::{json, Value};
+use serde_json::{Value, json};
 use std::fs;
 use std::io::Write;
 use std::path::{Path, PathBuf};
@@ -50,7 +50,7 @@ fn check_claude_code() -> bool {
 
     // Sometimes the binary won't be in the PATH, but the dotfiles will be
     let home = std::env::var("HOME").unwrap_or_else(|_| ".".to_string());
-    return Path::new(&home).join(".claude").exists()
+    return Path::new(&home).join(".claude").exists();
 }
 
 fn check_cursor() -> bool {
@@ -63,7 +63,7 @@ fn check_cursor() -> bool {
 
     // Sometimes the binary won't be in the PATH, but the dotfiles will be
     let home = std::env::var("HOME").unwrap_or_else(|_| ".".to_string());
-    return Path::new(&home).join(".cursor").exists()
+    return Path::new(&home).join(".cursor").exists();
 }
 
 // Shared utilities
@@ -190,10 +190,7 @@ fn install_cursor_hooks() -> Result<(), GitAiError> {
     }
 
     // Merge hooks object
-    let mut hooks_obj = merged
-        .get("hooks")
-        .cloned()
-        .unwrap_or_else(|| json!({}));
+    let mut hooks_obj = merged.get("hooks").cloned().unwrap_or_else(|| json!({}));
 
     // AfterEdit desired entries
     let desired_after = desired
@@ -245,13 +242,18 @@ fn install_cursor_hooks() -> Result<(), GitAiError> {
 
 fn merge_hooks(existing: Option<&Value>, desired: Option<&Value>) -> Option<Value> {
     let mut result = existing.cloned().unwrap_or_else(|| json!({}));
-    let desired = match desired { Some(v) => v, None => return Some(result) };
+    let desired = match desired {
+        Some(v) => v,
+        None => return Some(result),
+    };
 
     // Merge arrays by matcher for PreToolUse and PostToolUse. Append missing hooks, avoid duplicates.
     if let Some(obj) = result.as_object_mut() {
         for key in ["PreToolUse", "PostToolUse"].iter() {
             let desired_arr = desired.get(*key).and_then(|v| v.as_array());
-            if desired_arr.is_none() { continue; }
+            if desired_arr.is_none() {
+                continue;
+            }
             let desired_arr = desired_arr.unwrap();
 
             let mut existing_arr = obj
@@ -271,7 +273,9 @@ fn merge_hooks(existing: Option<&Value>, desired: Option<&Value>) -> Option<Valu
 
             for desired_item in desired_arr {
                 let desired_matcher = desired_item.get("matcher").and_then(|m| m.as_str());
-                if desired_matcher.is_none() { continue; }
+                if desired_matcher.is_none() {
+                    continue;
+                }
                 let desired_matcher = desired_matcher.unwrap();
 
                 // Find or create the block for this matcher
@@ -297,10 +301,15 @@ fn merge_hooks(existing: Option<&Value>, desired: Option<&Value>) -> Option<Valu
                     if let Some(desired_hooks) = desired_hooks {
                         for d in desired_hooks {
                             let duplicate = target_hooks.iter().any(|e| {
-                                if e == d { return true; }
+                                if e == d {
+                                    return true;
+                                }
                                 let dc = d.get("command").and_then(|c| c.as_str());
                                 let ec = e.get("command").and_then(|c| c.as_str());
-                                match (dc, ec) { (Some(a), Some(b)) => a == b, _ => false }
+                                match (dc, ec) {
+                                    (Some(a), Some(b)) => a == b,
+                                    _ => false,
+                                }
                             });
                             if !duplicate {
                                 target_hooks.push(d.clone());
@@ -370,11 +379,11 @@ impl Spinner {
         // Spinner starts automatically when created
     }
 
-    fn update_message(&self, message: &str) {
+    fn _update_message(&self, message: &str) {
         self.pb.set_message(message.to_string());
     }
 
-    async fn wait_for(&self, duration_ms: u64) {
+    async fn _wait_for(&self, duration_ms: u64) {
         smol::Timer::after(std::time::Duration::from_millis(duration_ms)).await;
     }
 
diff --git a/src/log_fmt/authorship_log_serialization.rs b/src/log_fmt/authorship_log_serialization.rs
@@ -119,7 +119,7 @@ impl AuthorshipLog {
     }
 
     /// Merge overlapping and adjacent line ranges
-    fn merge_line_ranges(ranges: &[LineRange]) -> Vec<LineRange> {
+    fn _merge_line_ranges(ranges: &[LineRange]) -> Vec<LineRange> {
         if ranges.is_empty() {
             return Vec::new();
         }
@@ -140,8 +140,8 @@ impl AuthorshipLog {
         let mut merged = Vec::new();
         for current in sorted_ranges {
             if let Some(last) = merged.last_mut() {
-                if Self::ranges_can_merge(last, &current) {
-                    *last = Self::merge_ranges(last, &current);
+                if Self::_ranges_can_merge(last, &current) {
+                    *last = Self::_merge_ranges(last, &current);
                 } else {
                     merged.push(current);
                 }
@@ -154,7 +154,7 @@ impl AuthorshipLog {
     }
 
     /// Check if two ranges can be merged (overlapping or adjacent)
-    fn ranges_can_merge(range1: &LineRange, range2: &LineRange) -> bool {
+    fn _ranges_can_merge(range1: &LineRange, range2: &LineRange) -> bool {
         let (start1, end1) = match range1 {
             LineRange::Single(line) => (*line, *line),
             LineRange::Range(start, end) => (*start, *end),
@@ -169,7 +169,7 @@ impl AuthorshipLog {
     }
 
     /// Merge two ranges into one
-    fn merge_ranges(range1: &LineRange, range2: &LineRange) -> LineRange {
+    fn _merge_ranges(range1: &LineRange, range2: &LineRange) -> LineRange {
         let (start1, end1) = match range1 {
             LineRange::Single(line) => (*line, *line),
             LineRange::Range(start, end) => (*start, *end),
@@ -344,7 +344,7 @@ impl AuthorshipLog {
     }
 
     /// Write to a writer in the new format
-    pub fn serialize_to_writer<W: Write>(&self, mut writer: W) -> std::io::Result<()> {
+    pub fn _serialize_to_writer<W: Write>(&self, mut writer: W) -> std::io::Result<()> {
         let content = self
             .serialize_to_string()
             .map_err(|_| std::io::Error::new(std::io::ErrorKind::Other, "Serialization failed"))?;
@@ -378,7 +378,7 @@ impl AuthorshipLog {
     }
 
     /// Read from a reader in the new format
-    pub fn deserialize_from_reader<R: BufRead>(
+    pub fn _deserialize_from_reader<R: BufRead>(
         reader: R,
     ) -> Result<Self, Box<dyn std::error::Error>> {
         let content: Result<String, _> = reader.lines().collect();
diff --git a/src/log_fmt/transcript.rs b/src/log_fmt/transcript.rs
@@ -190,7 +190,7 @@ impl AiTranscript {
     }
 
     /// Parse a Claude Code JSONL file into a transcript
-    pub fn from_claude_code_jsonl(jsonl_content: &str) -> Result<Self, serde_json::Error> {
+    pub fn _from_claude_code_jsonl(jsonl_content: &str) -> Result<Self, serde_json::Error> {
         let mut transcript = AiTranscript::new();
 
         for line in jsonl_content.lines() {
@@ -299,7 +299,7 @@ mod tests {
         .expect("Failed to read example JSONL file");
 
         let transcript =
-            AiTranscript::from_claude_code_jsonl(&jsonl_content).expect("Failed to parse JSONL");
+            AiTranscript::_from_claude_code_jsonl(&jsonl_content).expect("Failed to parse JSONL");
 
         // Verify we parsed some messages
         assert!(!transcript.messages().is_empty());
diff --git a/src/main.rs b/src/main.rs
@@ -1,10 +1,9 @@
 mod commands;
+mod config;
 mod error;
 mod git;
 mod log_fmt;
 mod utils;
-mod config;
-
 
 use clap::Parser;
 use git::find_repository;
@@ -134,7 +133,7 @@ fn handle_checkpoint(args: &[String]) {
     let mut reset = false;
     let mut model = None;
     let mut _prompt_json = None;
-    let mut prompt_path = None;
+    let mut _prompt_path = None;
     let mut prompt_id = None;
     let mut hook_input = None;
 
@@ -178,7 +177,7 @@ fn handle_checkpoint(args: &[String]) {
             }
             "--prompt-path" => {
                 if i + 1 < args.len() {
-                    prompt_path = Some(args[i + 1].clone());
+                    _prompt_path = Some(args[i + 1].clone());
                     i += 2;
                 } else {
                     eprintln!("Error: --prompt-path requires a value");
@@ -506,7 +505,9 @@ fn handle_push(args: &[String]) {
 
     // Helper to run a git command and optionally forward output, returning exit code
     fn run_git_and_forward(args: &[String], quiet: bool) -> i32 {
-        let output = Command::new(config::Config::get().git_cmd()).args(args).output();
+        let output = Command::new(config::Config::get().git_cmd())
+            .args(args)
+            .output();
         match output {
             Ok(output) => {
                 if !quiet {
@@ -599,7 +600,9 @@ fn get_default_remote(repo: &git2::Repository) -> Option<String> {
 
 fn proxy_to_git(args: &[String]) {
     // Use spawn for interactive commands
-    let child = Command::new(config::Config::get().git_cmd()).args(args).spawn();
+    let child = Command::new(config::Config::get().git_cmd())
+        .args(args)
+        .spawn();
 
     match child {
         Ok(mut child) => {
diff --git a/src/tmp_repo.rs b/src/tmp_repo.rs
@@ -380,7 +380,7 @@ impl TmpRepo {
         // Run the post-commit hook for all commits (including initial commit)
         let post_commit_result = post_commit(&self.repo, false)?; // false = not force
 
-        Ok((post_commit_result.1))
+        Ok(post_commit_result.1)
     }
 
     /// Creates a new branch and switches to it
diff --git a/src/utils.rs b/src/utils.rs
@@ -24,7 +24,7 @@ pub fn debug_log(msg: &str) {
 /// * `diff` - The git diff object to print
 /// * `old_label` - Label for the "old" side (e.g., commit SHA or description)
 /// * `new_label` - Label for the "new" side (e.g., commit SHA or description)
-pub fn print_diff(diff: &Diff, old_label: &str, new_label: &str) {
+pub fn _print_diff(diff: &Diff, old_label: &str, new_label: &str) {
     println!("Diff between {} and {}:", old_label, new_label);
 
     let mut file_count = 0;
diff --git a/tests/blame_flags.rs b/tests/blame_flags.rs
diff --git a/tests/merge_rebase.rs b/tests/merge_rebase.rs

Original file line number	Diff line number	Diff line change
`@@ -380,7 +380,7 @@ impl TmpRepo {`
`380`	`380`	`// Run the post-commit hook for all commits (including initial commit)`
`381`	`381`	`let post_commit_result = post_commit(&self.repo, false)?; // false = not force`
`382`	`382`
`383`		`- Ok((post_commit_result.1))`
	`383`	`+ Ok(post_commit_result.1)`
`384`	`384`	`}`
`385`	`385`
`386`	`386`	`/// Creates a new branch and switches to it`