From 4e37e12f9a1667416ebf4b2df4b9b363379b9c7a Mon Sep 17 00:00:00 2001 From: Edward Langley Date: Wed, 15 Apr 2026 23:42:44 -0700 Subject: [PATCH] style: reformat code and cleanup whitespace Reformat code for improved readability and remove unnecessary whitespace. Co-Authored-By: fiddlerwoaroof/git-smart-commit (gemma-4-26B-A4B-it-UD-Q5_K_XL.gguf) --- crates/improvise-core/src/workbook.rs | 1 - src/draw.rs | 7 +++++-- src/import/wizard.rs | 8 ++++++-- src/persistence/mod.rs | 14 +++----------- src/ui/grid.rs | 8 ++++++-- src/ui/tile_bar.rs | 7 +------ 6 files changed, 21 insertions(+), 24 deletions(-) diff --git a/crates/improvise-core/src/workbook.rs b/crates/improvise-core/src/workbook.rs index 4376f15..06e22ff 100644 --- a/crates/improvise-core/src/workbook.rs +++ b/crates/improvise-core/src/workbook.rs @@ -138,7 +138,6 @@ impl Workbook { view.col_offset = 0; } } - } #[cfg(test)] diff --git a/src/draw.rs b/src/draw.rs index a12dc03..326ce25 100644 --- a/src/draw.rs +++ b/src/draw.rs @@ -246,8 +246,11 @@ fn draw_content(f: &mut Frame, area: Rect, app: &App) { } if app.category_panel_open { let a = Rect::new(side.x, y, side.width, ph); - let content = - CategoryContent::new(&app.workbook.model, app.workbook.active_view(), &app.expanded_cats); + let content = CategoryContent::new( + &app.workbook.model, + app.workbook.active_view(), + &app.expanded_cats, + ); f.render_widget(Panel::new(content, &app.mode, app.cat_panel_cursor), a); y += ph; } diff --git a/src/import/wizard.rs b/src/import/wizard.rs index 9fdee5b..f6fc8f1 100644 --- a/src/import/wizard.rs +++ b/src/import/wizard.rs @@ -222,7 +222,8 @@ impl ImportPipeline { if let Some(val) = map.get(&measure.field).and_then(|v| v.as_f64()) { let mut cell_coords = coords.clone(); cell_coords.push(("_Measure".to_string(), measure.field.clone())); - wb.model.set_cell(CellKey::new(cell_coords), CellValue::Number(val)); + wb.model + .set_cell(CellKey::new(cell_coords), CellValue::Number(val)); } } } @@ -1112,6 +1113,9 @@ mod tests { ("Date_Month".to_string(), "2026-03".to_string()), ("_Measure".to_string(), "Amount".to_string()), ]); - assert_eq!(wb.model.get_cell(&key).and_then(|v| v.as_f64()), Some(100.0)); + assert_eq!( + wb.model.get_cell(&key).and_then(|v| v.as_f64()), + Some(100.0) + ); } } diff --git a/src/persistence/mod.rs b/src/persistence/mod.rs index 9d618d0..17551d0 100644 --- a/src/persistence/mod.rs +++ b/src/persistence/mod.rs @@ -578,11 +578,7 @@ fn coord_str(key: &CellKey) -> String { .join(", ") } -pub fn export_csv( - workbook: &Workbook, - view_name: &str, - path: &Path, -) -> Result<()> { +pub fn export_csv(workbook: &Workbook, view_name: &str, path: &Path) -> Result<()> { let view = workbook .views .get(view_name) @@ -1429,10 +1425,7 @@ Type=Food = 42 fn category_name_with_comma_space_in_data() { let mut m = Workbook::new("Test"); m.add_category("Income, Gross").unwrap(); - m.model - .category_mut("Income, Gross") - .unwrap() - .add_item("A"); + m.model.category_mut("Income, Gross").unwrap().add_item("A"); m.add_category("Month").unwrap(); m.model.category_mut("Month").unwrap().add_item("Jan"); m.model.set_cell( @@ -1602,8 +1595,7 @@ mod parser_prop_tests { for (i, value) in values.into_iter().enumerate() { let a = &items1[i % items1.len()]; let b = &items2[i % items2.len()]; - m.model - .set_cell(coord(&[("CatA", a), ("CatB", b)]), value); + m.model.set_cell(coord(&[("CatA", a), ("CatB", b)]), value); } m diff --git a/src/ui/grid.rs b/src/ui/grid.rs index a657f98..a61e263 100644 --- a/src/ui/grid.rs +++ b/src/ui/grid.rs @@ -915,7 +915,10 @@ mod tests { fn formula_cell_renders_computed_value() { let mut m = Workbook::new("Test"); m.add_category("Region").unwrap(); // → Column - m.model.category_mut("_Measure").unwrap().add_item("Revenue"); + m.model + .category_mut("_Measure") + .unwrap() + .add_item("Revenue"); m.model.category_mut("_Measure").unwrap().add_item("Cost"); // Profit is a formula target — dynamically included in _Measure m.model.category_mut("Region").unwrap().add_item("East"); @@ -927,7 +930,8 @@ mod tests { coord(&[("_Measure", "Cost"), ("Region", "East")]), CellValue::Number(600.0), ); - m.model.add_formula(parse_formula("Profit = Revenue - Cost", "_Measure").unwrap()); + m.model + .add_formula(parse_formula("Profit = Revenue - Cost", "_Measure").unwrap()); m.active_view_mut() .set_axis("_Index", crate::view::Axis::None); m.active_view_mut() diff --git a/src/ui/tile_bar.rs b/src/ui/tile_bar.rs index 34c7695..4129e3d 100644 --- a/src/ui/tile_bar.rs +++ b/src/ui/tile_bar.rs @@ -18,12 +18,7 @@ pub struct TileBar<'a> { } impl<'a> TileBar<'a> { - pub fn new( - model: &'a Model, - view: &'a View, - mode: &'a AppMode, - tile_cat_idx: usize, - ) -> Self { + pub fn new(model: &'a Model, view: &'a View, mode: &'a AppMode, tile_cat_idx: usize) -> Self { Self { model, view,