style: add braces to if statements for consistency

Consolidate if-let chain formatting by adding missing braces throughout the
project. This improves readability and ensures consistency across the
codebase.

Co-Authored-By: fiddlerwoaroof/git-smart-commit (gemma-4-31B-it-UD-Q4_K_XL.gguf)
This commit is contained in:
Edward Langley
2026-04-14 00:49:32 -07:00
parent 8baa4c4865
commit 35e2626a7d
8 changed files with 83 additions and 68 deletions

View File

@ -168,7 +168,8 @@ fn draw(f: &mut Frame, app: &App) {
f.render_widget(HelpWidget::new(app.help_page), size); f.render_widget(HelpWidget::new(app.help_page), size);
} }
if matches!(app.mode, AppMode::ImportWizard) if matches!(app.mode, AppMode::ImportWizard)
&& let Some(wizard) = &app.wizard { && let Some(wizard) = &app.wizard
{
f.render_widget(ImportWizardWidget::new(wizard), size); f.render_widget(ImportWizardWidget::new(wizard), size);
} }
// ExportPrompt now uses the minibuffer at the bottom bar. // ExportPrompt now uses the minibuffer at the bottom bar.

View File

@ -150,7 +150,8 @@ impl ImportPipeline {
} }
if !measures.is_empty() if !measures.is_empty()
&& let Some(cat) = model.category_mut("_Measure") { && let Some(cat) = model.category_mut("_Measure")
{
for m in &measures { for m in &measures {
cat.add_item(&m.field); cat.add_item(&m.field);
} }
@ -177,7 +178,8 @@ impl ImportPipeline {
// Extract date components from this field's value // Extract date components from this field's value
for (field, fmt, comp, derived_name) in &date_extractions { for (field, fmt, comp, derived_name) in &date_extractions {
if *field == cat_proposal.field if *field == cat_proposal.field
&& let Some(derived_val) = extract_date_component(&v, fmt, *comp) { && let Some(derived_val) = extract_date_component(&v, fmt, *comp)
{
if let Some(cat) = model.category_mut(derived_name) { if let Some(cat) = model.category_mut(derived_name) {
cat.add_item(&derived_val); cat.add_item(&derived_val);
} }

View File

@ -185,7 +185,8 @@ impl Model {
// so it appears in the grid. _Measure targets are dynamically included // so it appears in the grid. _Measure targets are dynamically included
// via measure_item_names(). // via measure_item_names().
if formula.target_category != "_Measure" if formula.target_category != "_Measure"
&& let Some(cat) = self.categories.get_mut(&formula.target_category) { && let Some(cat) = self.categories.get_mut(&formula.target_category)
{
cat.add_item(&formula.target); cat.add_item(&formula.target);
} }
// Replace if same target within the same category // Replace if same target within the same category
@ -331,7 +332,8 @@ impl Model {
} }
for formula in &self.formulas { for formula in &self.formulas {
if let Some(item_val) = key.get(&formula.target_category) if let Some(item_val) = key.get(&formula.target_category)
&& item_val == formula.target { && item_val == formula.target
{
return self.eval_formula_depth(formula, key, depth - 1); return self.eval_formula_depth(formula, key, depth - 1);
} }
} }
@ -456,7 +458,8 @@ impl Model {
fn evaluate_formula_cell(&self, key: &CellKey, none_cats: &[String]) -> Option<CellValue> { fn evaluate_formula_cell(&self, key: &CellKey, none_cats: &[String]) -> Option<CellValue> {
for formula in &self.formulas { for formula in &self.formulas {
if let Some(item_val) = key.get(&formula.target_category) if let Some(item_val) = key.get(&formula.target_category)
&& item_val == formula.target { && item_val == formula.target
{
return self.eval_formula_with_cache(formula, key, none_cats); return self.eval_formula_with_cache(formula, key, none_cats);
} }
} }
@ -560,7 +563,8 @@ impl Model {
use crate::formula::AggFunc; use crate::formula::AggFunc;
let mut partial = context.without(target_category); let mut partial = context.without(target_category);
if let Expr::Ref(item_name) = inner.as_ref() if let Expr::Ref(item_name) = inner.as_ref()
&& let Some(cat) = find_item_category(model, item_name) { && let Some(cat) = find_item_category(model, item_name)
{
partial = partial.with(cat, item_name.as_str()); partial = partial.with(cat, item_name.as_str());
} }
if let Some(f) = agg_filter { if let Some(f) = agg_filter {
@ -753,7 +757,8 @@ impl Model {
Expr::Agg(func, inner, agg_filter) => { Expr::Agg(func, inner, agg_filter) => {
let mut partial = context.without(target_category); let mut partial = context.without(target_category);
if let Expr::Ref(item_name) = inner.as_ref() if let Expr::Ref(item_name) = inner.as_ref()
&& let Some(cat) = find_item_category(model, item_name) { && let Some(cat) = find_item_category(model, item_name)
{
partial = partial.with(cat, item_name.as_str()); partial = partial.with(cat, item_name.as_str());
} }
if let Some(f) = agg_filter { if let Some(f) = agg_filter {

View File

@ -171,7 +171,8 @@ pub fn format_md(model: &Model) -> String {
for (cat, axis) in &view.category_axes { for (cat, axis) in &view.category_axes {
let qcat = quote_name(cat); let qcat = quote_name(cat);
if *axis == Axis::Page if *axis == Axis::Page
&& let Some(sel) = view.page_selections.get(cat) { && let Some(sel) = view.page_selections.get(cat)
{
w!(out, "{qcat}: page, {}", quote_name(sel)); w!(out, "{qcat}: page, {}", quote_name(sel));
continue; continue;
} }
@ -398,7 +399,8 @@ pub fn parse_md(text: &str) -> Result<Model> {
if fl.as_rule() == Rule::formula_line { if fl.as_rule() == Rule::formula_line {
let raw = first_str(fl)?; let raw = first_str(fl)?;
if let Some(i) = raw.rfind(" [") if let Some(i) = raw.rfind(" [")
&& raw.ends_with(']') { && raw.ends_with(']')
{
formulas.push(( formulas.push((
raw[..i].to_string(), raw[..i].to_string(),
raw[i + 2..raw.len() - 1].to_string(), raw[i + 2..raw.len() - 1].to_string(),
@ -475,7 +477,8 @@ pub fn parse_md(text: &str) -> Result<Model> {
}; };
pv.axes.push((cat.clone(), axis)); pv.axes.push((cat.clone(), axis));
if axis == Axis::Page if axis == Axis::Page
&& let Some(sel_pair) = parts.next() { && let Some(sel_pair) = parts.next()
{
pv.page_selections.push((cat, extract_name(sel_pair)?)); pv.page_selections.push((cat, extract_name(sel_pair)?));
} }
} }
@ -548,7 +551,8 @@ pub fn parse_md(text: &str) -> Result<Model> {
} }
if let Some(iv) = &initial_view if let Some(iv) = &initial_view
&& m.views.contains_key(iv) { && m.views.contains_key(iv)
{
m.active_view = iv.clone(); m.active_view = iv.clone();
} }

View File

@ -374,8 +374,10 @@ impl App {
} }
pub fn autosave_if_needed(&mut self) { pub fn autosave_if_needed(&mut self) {
if self.dirty && self.last_autosave.elapsed() > Duration::from_secs(30) if self.dirty
&& let Some(path) = &self.file_path.clone() { && self.last_autosave.elapsed() > Duration::from_secs(30)
&& let Some(path) = &self.file_path.clone()
{
let ap = persistence::autosave_path(path); let ap = persistence::autosave_path(path);
let _ = persistence::save(&self.model, &ap); let _ = persistence::save(&self.model, &ap);
self.last_autosave = Instant::now(); self.last_autosave = Instant::now();

View File

@ -36,8 +36,7 @@ pub fn build_cat_tree(model: &Model, expanded: &HashSet<String>) -> Vec<CatTreeE
item_count, item_count,
expanded: is_expanded, expanded: is_expanded,
}); });
if is_expanded if is_expanded && let Some(cat) = cat {
&& let Some(cat) = cat {
for item_name in cat.ordered_item_names() { for item_name in cat.ordered_item_names() {
entries.push(CatTreeEntry::Item { entries.push(CatTreeEntry::Item {
cat_name: cat_name.to_string(), cat_name: cat_name.to_string(),

View File

@ -86,7 +86,8 @@ impl Effect for AddFormula {
// appears in the grid. _Measure targets are dynamically included // appears in the grid. _Measure targets are dynamically included
// via Model::measure_item_names(). // via Model::measure_item_names().
if formula.target_category != "_Measure" if formula.target_category != "_Measure"
&& let Some(cat) = app.model.category_mut(&formula.target_category) { && let Some(cat) = app.model.category_mut(&formula.target_category)
{
cat.add_item(&formula.target); cat.add_item(&formula.target);
} }
app.model.add_formula(formula); app.model.add_formula(formula);

View File

@ -54,7 +54,8 @@ impl GridLayout {
) -> Self { ) -> Self {
let mut layout = Self::new(model, view); let mut layout = Self::new(model, view);
if layout.is_records_mode() if layout.is_records_mode()
&& let Some(records) = frozen_records { && let Some(records) = frozen_records
{
let row_items: Vec<AxisEntry> = (0..records.len()) let row_items: Vec<AxisEntry> = (0..records.len())
.map(|i| AxisEntry::DataItem(vec![i.to_string()])) .map(|i| AxisEntry::DataItem(vec![i.to_string()]))
.collect(); .collect();