Make clippy happy <3ellie/bar

6 files changed, 8 insertions, 18 deletions

diff --git a/src/command/client/history.rs b/src/command/client/history.rs
index 5432f838..8767429b 100644
--- a/src/command/client/history.rs
+++ b/src/command/client/history.rs
@@ -159,7 +159,7 @@ fn print_list_with<'h>(
     };
 
     for h in h.rev() {
-        writeln!(w, "{}", fmt.with_args(&FmtHistory(&h))).expect("failed to write history");
+        writeln!(w, "{}", fmt.with_args(&FmtHistory(h))).expect("failed to write history");
     }
 }
 
@@ -192,6 +192,7 @@ pub fn print_cmd_only<'h>(w: &mut StdoutLock, h: impl DoubleEndedIterator<Item =
 }
 
 impl Cmd {
+    #[allow(clippy::too_many_lines)]
     pub async fn run(&self, settings: &Settings, db: &mut impl Database) -> Result<()> {
         let context = current_context();
 
diff --git a/src/command/client/search.rs b/src/command/client/search.rs
index 6161e102..5b705321 100644
--- a/src/command/client/search.rs
+++ b/src/command/client/search.rs
@@ -5,7 +5,6 @@ use eyre::Result;
 use atuin_client::{
     database::Database,
     database::{current_context, OptFilters},
-    history::History,
     result::HistoryResult,
     settings::{FilterMode, SearchMode, Settings},
 };
diff --git a/src/command/client/search/engines.rs b/src/command/client/search/engines.rs
index 3e7e9fce..01dcc60b 100644
--- a/src/command/client/search/engines.rs
+++ b/src/command/client/search/engines.rs
@@ -1,7 +1,6 @@
 use async_trait::async_trait;
 use atuin_client::{
     database::{Context, Database},
-    history::History,
     result::HistoryResult,
     settings::{FilterMode, SearchMode},
 };
diff --git a/src/command/client/search/engines/db.rs b/src/command/client/search/engines/db.rs
index 22d47e9f..eb29edb6 100644
--- a/src/command/client/search/engines/db.rs
+++ b/src/command/client/search/engines/db.rs
@@ -1,7 +1,6 @@
 use async_trait::async_trait;
 use atuin_client::{
-    database::Database, database::OptFilters, history::History, result::HistoryResult,
-    settings::SearchMode,
+    database::Database, database::OptFilters, result::HistoryResult, settings::SearchMode,
 };
 use eyre::Result;
 
diff --git a/src/command/client/search/engines/skim.rs b/src/command/client/search/engines/skim.rs
index 208bf6df..079b7bab 100644
--- a/src/command/client/search/engines/skim.rs
+++ b/src/command/client/search/engines/skim.rs
@@ -1,9 +1,7 @@
 use std::path::Path;
 
 use async_trait::async_trait;
-use atuin_client::{
-    database::Database, history::History, result::HistoryResult, settings::FilterMode,
-};
+use atuin_client::{database::Database, result::HistoryResult, settings::FilterMode};
 use chrono::Utc;
 use eyre::Result;
 use fuzzy_matcher::{skim::SkimMatcherV2, FuzzyMatcher};
diff --git a/src/command/client/search/interactive.rs b/src/command/client/search/interactive.rs
index 256b0f4e..228d172b 100644
--- a/src/command/client/search/interactive.rs
+++ b/src/command/client/search/interactive.rs
@@ -14,7 +14,6 @@ use unicode_width::UnicodeWidthStr;
 
 use atuin_client::{
     database::{current_context, Database},
-    history::History,
     result::HistoryResult,
     settings::{ExitMode, FilterMode, SearchMode, Settings},
 };
@@ -308,9 +307,9 @@ impl State {
         let preview = self.build_preview(results, compact, preview_width, chunks[3].width.into());
         f.render_widget(preview, chunks[3]);
 
-        if results.len() > 0 {
+        if !results.is_empty() {
             let selected_history = results[self.results_state.selected()].clone();
-            self.render_bar(f, &selected_history, chunks[4]);
+            Self::render_bar(f, &selected_history, chunks[4]);
         }
 
         let extra_width = UnicodeWidthStr::width(self.search.input.substring());
@@ -374,18 +373,13 @@ impl State {
         results_list
     }
 
-    fn render_bar<T: Backend>(
-        &mut self,
-        f: &mut Frame<'_, T>,
-        history: &HistoryResult,
-        chunk: Rect,
-    ) {
+    fn render_bar<T: Backend>(f: &mut Frame<'_, T>, history: &HistoryResult, chunk: Rect) {
         let bar = Layout::default()
             .direction(Direction::Horizontal)
             .constraints([Constraint::Ratio(9, 10), Constraint::Ratio(1, 10)].as_ref())
             .split(chunk);
 
-        let directory = Paragraph::new(Text::from(Span::raw(format!("{}", history.history.cwd,))))
+        let directory = Paragraph::new(Text::from(Span::raw(history.history.cwd.to_string())))
             .style(Style::default().bg(Color::White).fg(Color::Black));
 
         let count = Paragraph::new(Text::from(Span::raw(format!("x{}", history.count,))))