chore: fix error format, clippy and rust format

atuinsh · Jan 19, 2025 · 25c9d49 · 25c9d49
1 parent 4bfde9d
commit 25c9d49
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 10 deletions.
diff --git a/crates/atuin-client/src/kv.rs b/crates/atuin-client/src/kv.rs
@@ -66,7 +66,10 @@ impl KvRecord {
                 })
             }
             _ => {
-                bail!(t!("unknown version %{version}", version=format!("{version:?}")))
+                bail!(t!(
+                    "unknown version %{version}",
+                    version = format!("{version:?}")
+                ))
             }
         }
     }

diff --git a/crates/atuin-client/src/theme.rs b/crates/atuin-client/src/theme.rs
@@ -469,7 +469,7 @@ impl ThemeManager {
                 Ok(theme) => theme,
                 Err(err) => {
                     log::warn!(
-                        "{}: {:?}",
+                        "{}: {}",
                         t!("Could not load theme %{theme}", theme = name),
                         err
                     );

diff --git a/crates/atuin/src/command/client/search/interactive.rs b/crates/atuin/src/command/client/search/interactive.rs
@@ -605,13 +605,13 @@ impl State {
             border_size,
             preview_width,
         );
-        let show_help = settings.show_help && (!compact || f.area().height > 1);
         // This is an OR, as it seems more likely for someone to wish to override
         // tabs unexpectedly being missed, than unexpectedly present.
         let hide_extra = settings.auto_hide_height != 0
             && compact
             && f.area().height <= settings.auto_hide_height;
-        let show_tabs = settings.show_tabs && !hide_extra;
+        let tab_col = if settings.show_tabs && !hide_extra { 1 } else { 0 };
+        let help_col = if settings.show_help && (!compact || f.area().height > 1) { 1 } else { 0 };
         let chunks = Layout::default()
             .direction(Direction::Vertical)
             .margin(0)
@@ -622,21 +622,21 @@ impl State {
                         Constraint::Length(1 + border_size),               // input
                         Constraint::Min(1),                                // results list
                         Constraint::Length(preview_height),                // preview
-                        Constraint::Length(if show_tabs { 1 } else { 0 }), // tabs
-                        Constraint::Length(if show_help { 1 } else { 0 }), // header (sic)
+                        Constraint::Length(tab_col), // tabs
+                        Constraint::Length(help_col), // header (sic)
                     ]
                 } else if hide_extra {
                     [
-                        Constraint::Length(if show_help { 1 } else { 0 }), // header
+                        Constraint::Length(help_col), // header
                         Constraint::Length(0),                             // tabs
                         Constraint::Min(1),                                // results list
                         Constraint::Length(0),
                         Constraint::Length(0),
                     ]
                 } else {
                     [
-                        Constraint::Length(if show_help { 1 } else { 0 }), // header
-                        Constraint::Length(if show_tabs { 1 } else { 0 }), // tabs
+                        Constraint::Length(help_col), // header
+                        Constraint::Length(tab_col), // tabs
                         Constraint::Min(1),                                // results list
                         Constraint::Length(1 + border_size),               // input
                         Constraint::Length(preview_height),                // preview
@@ -662,7 +662,7 @@ impl State {
             .map(Line::from)
             .collect();
 
-        if show_tabs {
+        if tab_col == 1 {
             let tabs = Tabs::new(titles)
                 .block(Block::default().borders(Borders::NONE))
                 .select(self.tab_index)