From fe74cc5fcbd5686760e4f700d6b8b66adf1eabc8 Mon Sep 17 00:00:00 2001
From: Edward Langley <el-github@elangley.org>
Date: Wed, 1 Apr 2026 22:17:11 -0700
Subject: [PATCH] chore: clippy + fmt

---
 src/command/dispatch.rs |  4 +++-
 src/draw.rs             |  1 -
 src/formula/parser.rs   |  4 ++--
 src/main.rs             | 13 +++++++------
 src/view/layout.rs      |  2 +-
 5 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/src/command/dispatch.rs b/src/command/dispatch.rs
index c837f09..edf3728 100644
--- a/src/command/dispatch.rs
+++ b/src/command/dispatch.rs
@@ -175,7 +175,9 @@ fn import_headless(
     model_name: Option<&str>,
     array_path: Option<&str>,
 ) -> CommandResult {
-    let is_csv = path.extension().is_some_and(|ext| ext.eq_ignore_ascii_case("csv"));
+    let is_csv = path
+        .extension()
+        .is_some_and(|ext| ext.eq_ignore_ascii_case("csv"));
 
     let records = if is_csv {
         // Parse CSV file
diff --git a/src/draw.rs b/src/draw.rs
index 2dceeb9..e505487 100644
--- a/src/draw.rs
+++ b/src/draw.rs
@@ -26,7 +26,6 @@ use crate::ui::import_wizard_ui::ImportWizardWidget;
 use crate::ui::tile_bar::TileBar;
 use crate::ui::view_panel::ViewPanel;
 
-
 struct TuiContext<'a> {
     terminal: Terminal<CrosstermBackend<&'a mut Stdout>>,
 }
diff --git a/src/formula/parser.rs b/src/formula/parser.rs
index dcef661..e374578 100644
--- a/src/formula/parser.rs
+++ b/src/formula/parser.rs
@@ -16,7 +16,7 @@ pub fn parse_formula(raw: &str, target_category: &str) -> Result<Formula> {
 
     // Check for WHERE clause at top level
     let (expr_str, filter) = split_where(rest);
-    let filter = filter.map(|w| parse_where(w)).transpose()?;
+    let filter = filter.map(parse_where).transpose()?;
 
     let expr = parse_expr(expr_str.trim())?;
 
@@ -299,7 +299,7 @@ fn parse_primary(tokens: &[Token], pos: &mut usize) -> Result<Expr> {
                         // Optional WHERE filter
                         let filter = if *pos < tokens.len() {
                             if let Token::Ident(kw) = &tokens[*pos] {
-                                if kw.to_ascii_uppercase() == "WHERE" {
+                                if kw.eq_ignore_ascii_case("WHERE") {
                                     *pos += 1;
                                     let cat = match &tokens[*pos] {
                                         Token::Ident(s) => {
diff --git a/src/main.rs b/src/main.rs
index f1dde67..1a538e1 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,18 +1,18 @@
 mod command;
+mod draw;
 mod formula;
 mod import;
 mod model;
 mod persistence;
 mod ui;
 mod view;
-mod draw;
 
-use std::path::PathBuf;
+use std::path::{Path, PathBuf};
 
 use anyhow::{Context, Result};
 
-use model::Model;
 use draw::run_tui;
+use model::Model;
 use serde_json::Value;
 
 fn main() -> Result<()> {
@@ -42,8 +42,9 @@ impl Runnable for CmdLineArgs {
     }
 }
 
-fn csv_path_p(path:&PathBuf) -> bool {
-    path.extension().is_some_and(|ext| ext.eq_ignore_ascii_case("csv"))
+fn csv_path_p(path: &Path) -> bool {
+    path.extension()
+        .is_some_and(|ext| ext.eq_ignore_ascii_case("csv"))
 }
 
 fn get_import_data(path: PathBuf) -> Option<Value> {
@@ -115,7 +116,7 @@ impl Runnable for HeadlessArgs {
         }
 
         if let Some(path) = self.file_path {
-            persistence::save(&mut model, &path)?;
+            persistence::save(&model, &path)?;
         }
 
         std::process::exit(exit_code);
diff --git a/src/view/layout.rs b/src/view/layout.rs
index 42e4887..712e644 100644
--- a/src/view/layout.rs
+++ b/src/view/layout.rs
@@ -223,7 +223,7 @@ fn expand_category(
         }
 
         // Skip the data item if its group is collapsed.
-        if item_group.map_or(false, |g| view.is_group_collapsed(cat_name, g)) {
+        if item_group.is_some_and(|g| view.is_group_collapsed(cat_name, g)) {
             continue;
         }