Format codebase with rustfmt

cli-bin/src/cli/annotate.rs

@@ -1,11 +1,11 @@
 // src/cli/annotate.rs
-use clap::{Subcommand, Args};
-use rusqlite::Connection;
 use crate::cli::Format;
+use clap::{Args, Subcommand};
+use rusqlite::Connection;
 
 #[derive(Subcommand, Debug)]
 pub enum AnnotateCmd {
-    Add (ArgsAdd),
+    Add(ArgsAdd),
     List(ArgsList),
 }
 
@@ -13,16 +13,20 @@ pub enum AnnotateCmd {
 pub struct ArgsAdd {
     pub file: String,
     pub note: String,
-    #[arg(long)] pub range: Option<String>,
-    #[arg(long)] pub highlight: bool,
+    #[arg(long)]
+    pub range: Option<String>,
+    #[arg(long)]
+    pub highlight: bool,
 }
 
 #[derive(Args, Debug)]
-pub struct ArgsList { pub file_pattern: String }
+pub struct ArgsList {
+    pub file_pattern: String,
+}
 
 pub fn run(cmd: &AnnotateCmd, _conn: &mut Connection, _format: Format) -> anyhow::Result<()> {
     match cmd {
-        AnnotateCmd::Add(a)  => todo!("annotate add {:?}", a),
+        AnnotateCmd::Add(a) => todo!("annotate add {:?}", a),
         AnnotateCmd::List(a) => todo!("annotate list {:?}", a),
     }
 }

cli-bin/src/cli/coll.rs

@@ -3,8 +3,8 @@
 use clap::{Args, Subcommand};
 use rusqlite::Connection;
 
-use crate::cli::Format;   // local enum for text / json output
-use libmarlin::db;        // core DB helpers from the library crate
+use crate::cli::Format; // local enum for text / json output
+use libmarlin::db; // core DB helpers from the library crate
 
 #[derive(Subcommand, Debug)]
 pub enum CollCmd {
@@ -36,11 +36,9 @@ pub struct ListArgs {
 ///
 /// Returns the collection ID or an error if it doesn’t exist.
 fn lookup_collection_id(conn: &Connection, name: &str) -> anyhow::Result<i64> {
-    conn.query_row(
-        "SELECT id FROM collections WHERE name = ?1",
-        [name],
-        |r| r.get(0),
-    )
+    conn.query_row("SELECT id FROM collections WHERE name = ?1", [name], |r| {
+        r.get(0)
+    })
     .map_err(|_| anyhow::anyhow!("collection not found: {}", name))
 }
 
@@ -74,11 +72,7 @@ pub fn run(cmd: &CollCmd, conn: &mut Connection, fmt: Format) -> anyhow::Result<
                 Format::Json => {
                     #[cfg(feature = "json")]
                     {
-                        println!(
-                            "{{\"collection\":\"{}\",\"added\":{}}}",
-                            a.name,
-                            ids.len()
-                        );
+                        println!("{{\"collection\":\"{}\",\"added\":{}}}", a.name, ids.len());
                     }
                 }
             }

cli-bin/src/cli/event.rs

@@ -1,11 +1,11 @@
 // src/cli/event.rs
-use clap::{Subcommand, Args};
-use rusqlite::Connection;
 use crate::cli::Format;
+use clap::{Args, Subcommand};
+use rusqlite::Connection;
 
 #[derive(Subcommand, Debug)]
 pub enum EventCmd {
-    Add     (ArgsAdd),
+    Add(ArgsAdd),
     Timeline,
 }
 
@@ -18,7 +18,7 @@ pub struct ArgsAdd {
 
 pub fn run(cmd: &EventCmd, _conn: &mut Connection, _format: Format) -> anyhow::Result<()> {
     match cmd {
-        EventCmd::Add(a)      => todo!("event add {:?}", a),
-        EventCmd::Timeline    => todo!("event timeline"),
+        EventCmd::Add(a) => todo!("event add {:?}", a),
+        EventCmd::Timeline => todo!("event timeline"),
     }
 }

cli-bin/src/cli/link.rs

@@ -1,15 +1,15 @@
 //! src/cli/link.rs – manage typed relationships between files
 
-use clap::{Subcommand, Args};
+use clap::{Args, Subcommand};
 use rusqlite::Connection;
 
-use crate::cli::Format;   // output selector
-use libmarlin::db;        // ← switched from `crate::db`
+use crate::cli::Format; // output selector
+use libmarlin::db; // ← switched from `crate::db`
 
 #[derive(Subcommand, Debug)]
 pub enum LinkCmd {
     Add(LinkArgs),
-    Rm (LinkArgs),
+    Rm(LinkArgs),
     List(ListArgs),
     Backlinks(BacklinksArgs),
 }
@@ -17,7 +17,7 @@ pub enum LinkCmd {
 #[derive(Args, Debug)]
 pub struct LinkArgs {
     pub from: String,
-    pub to:   String,
+    pub to: String,
     #[arg(long)]
     pub r#type: Option<String>,
 }
@@ -70,7 +70,10 @@ pub fn run(cmd: &LinkCmd, conn: &mut Connection, format: Format) -> anyhow::Resu
             match format {
                 Format::Text => {
                     if let Some(t) = &args.r#type {
-                        println!("Removed link '{}' → '{}' [type='{}']", args.from, args.to, t);
+                        println!(
+                            "Removed link '{}' → '{}' [type='{}']",
+                            args.from, args.to, t
+                        );
                     } else {
                         println!("Removed link '{}' → '{}'", args.from, args.to);
                     }

cli-bin/src/cli/remind.rs

@@ -1,7 +1,7 @@
 // src/cli/remind.rs
-use clap::{Subcommand, Args};
-use rusqlite::Connection;
 use crate::cli::Format;
+use clap::{Args, Subcommand};
+use rusqlite::Connection;
 
 #[derive(Subcommand, Debug)]
 pub enum RemindCmd {
@@ -11,8 +11,8 @@ pub enum RemindCmd {
 #[derive(Args, Debug)]
 pub struct ArgsSet {
     pub file_pattern: String,
-    pub timestamp:    String,
-    pub message:      String,
+    pub timestamp: String,
+    pub message: String,
 }
 
 pub fn run(cmd: &RemindCmd, _conn: &mut Connection, _format: Format) -> anyhow::Result<()> {

cli-bin/src/cli/state.rs

@@ -1,7 +1,7 @@
 // src/cli/state.rs
-use clap::{Subcommand, Args};
-use rusqlite::Connection;
 use crate::cli::Format;
+use clap::{Args, Subcommand};
+use rusqlite::Connection;
 
 #[derive(Subcommand, Debug)]
 pub enum StateCmd {
@@ -11,16 +11,24 @@ pub enum StateCmd {
 }
 
 #[derive(Args, Debug)]
-pub struct ArgsSet   { pub file_pattern: String, pub new_state: String }
+pub struct ArgsSet {
+    pub file_pattern: String,
+    pub new_state: String,
+}
 #[derive(Args, Debug)]
-pub struct ArgsTrans { pub from_state: String,   pub to_state: String }
+pub struct ArgsTrans {
+    pub from_state: String,
+    pub to_state: String,
+}
 #[derive(Args, Debug)]
-pub struct ArgsLog   { pub file_pattern: String }
+pub struct ArgsLog {
+    pub file_pattern: String,
+}
 
 pub fn run(cmd: &StateCmd, _conn: &mut Connection, _format: Format) -> anyhow::Result<()> {
     match cmd {
-        StateCmd::Set(a)           => todo!("state set {:?}", a),
-        StateCmd::TransitionsAdd(a)=> todo!("state transitions-add {:?}", a),
-        StateCmd::Log(a)           => todo!("state log {:?}", a),
+        StateCmd::Set(a) => todo!("state set {:?}", a),
+        StateCmd::TransitionsAdd(a) => todo!("state transitions-add {:?}", a),
+        StateCmd::Log(a) => todo!("state log {:?}", a),
     }
 }

cli-bin/src/cli/task.rs

@@ -1,7 +1,7 @@
 // src/cli/task.rs
-use clap::{Subcommand, Args};
-use rusqlite::Connection;
 use crate::cli::Format;
+use clap::{Args, Subcommand};
+use rusqlite::Connection;
 
 #[derive(Subcommand, Debug)]
 pub enum TaskCmd {
@@ -10,9 +10,14 @@ pub enum TaskCmd {
 }
 
 #[derive(Args, Debug)]
-pub struct ArgsScan { pub directory: String }
+pub struct ArgsScan {
+    pub directory: String,
+}
 #[derive(Args, Debug)]
-pub struct ArgsList { #[arg(long)] pub due_today: bool }
+pub struct ArgsList {
+    #[arg(long)]
+    pub due_today: bool,
+}
 
 pub fn run(cmd: &TaskCmd, _conn: &mut Connection, _format: Format) -> anyhow::Result<()> {
     match cmd {

cli-bin/src/cli/version.rs

@@ -1,7 +1,7 @@
 // src/cli/version.rs
-use clap::{Subcommand, Args};
-use rusqlite::Connection;
 use crate::cli::Format;
+use clap::{Args, Subcommand};
+use rusqlite::Connection;
 
 #[derive(Subcommand, Debug)]
 pub enum VersionCmd {
@@ -9,7 +9,9 @@ pub enum VersionCmd {
 }
 
 #[derive(Args, Debug)]
-pub struct ArgsDiff { pub file: String }
+pub struct ArgsDiff {
+    pub file: String,
+}
 
 pub fn run(cmd: &VersionCmd, _conn: &mut Connection, _format: Format) -> anyhow::Result<()> {
     match cmd {

cli-bin/src/cli/view.rs

@@ -6,8 +6,8 @@ use anyhow::Result;
 use clap::{Args, Subcommand};
 use rusqlite::Connection;
 
-use crate::cli::Format;   // output selector stays local
-use libmarlin::db;        // ← path switched from `crate::db`
+use crate::cli::Format; // output selector stays local
+use libmarlin::db; // ← path switched from `crate::db`
 
 #[derive(Subcommand, Debug)]
 pub enum ViewCmd {

cli-bin/src/cli/watch.rs

@@ -5,8 +5,8 @@ use clap::Subcommand;
 use libmarlin::watcher::{WatcherConfig, WatcherState};
 use rusqlite::Connection;
 use std::path::PathBuf;
-use std::sync::Arc;
 use std::sync::atomic::{AtomicBool, Ordering};
+use std::sync::Arc;
 use std::thread;
 use std::time::{Duration, Instant};
 use tracing::info;
@@ -30,15 +30,15 @@ pub enum WatchCmd {
         /// Directory to watch (defaults to current directory)
         #[arg(default_value = ".")]
         path: PathBuf,
-        
+
         /// Debounce window in milliseconds (default: 100ms)
         #[arg(long, default_value = "100")]
         debounce_ms: u64,
     },
-    
+
     /// Show status of currently active watcher
     Status,
-    
+
     /// Stop the currently running watcher
     Stop,
 }
@@ -60,7 +60,7 @@ pub fn run(cmd: &WatchCmd, _conn: &mut Connection, _format: super::Format) -> Re
             let status = watcher.status()?;
             info!("Watcher started. Press Ctrl+C to stop watching.");
             info!("Watching {} paths", status.watched_paths.len());
-            
+
             let start_time = Instant::now();
             let mut last_status_time = Instant::now();
             let running = Arc::new(AtomicBool::new(true));
@@ -80,7 +80,7 @@ pub fn run(cmd: &WatchCmd, _conn: &mut Connection, _format: super::Format) -> Re
                 }
 
                 // Corrected line: removed the extra closing parenthesis
-                if last_status_time.elapsed() > Duration::from_secs(10) { 
+                if last_status_time.elapsed() > Duration::from_secs(10) {
                     let uptime = start_time.elapsed();
                     info!(
                         "Watcher running for {}s, processed {} events, queue: {}, state: {:?}",
@@ -104,7 +104,9 @@ pub fn run(cmd: &WatchCmd, _conn: &mut Connection, _format: super::Format) -> Re
             Ok(())
         }
         WatchCmd::Status => {
-            info!("Status command: No active watcher process to query in this CLI invocation model.");
+            info!(
+                "Status command: No active watcher process to query in this CLI invocation model."
+            );
             info!("To see live status, run 'marlin watch start' which prints periodic updates.");
             Ok(())
         }