From a30c4bd62227914be2262051c76e874efd036619 Mon Sep 17 00:00:00 2001 From: seryj Date: Wed, 26 Jul 2023 22:32:38 +0200 Subject: [PATCH] fix clippy --- src/app/core.rs | 20 +++++--------------- src/app/editor/mod.rs | 2 +- src/cli/print_format.rs | 12 ++++++------ 3 files changed, 12 insertions(+), 22 deletions(-) diff --git a/src/app/core.rs b/src/app/core.rs index 6d7312d..56a06cb 100644 --- a/src/app/core.rs +++ b/src/app/core.rs @@ -36,20 +36,15 @@ pub struct Tabs { pub index: usize, } -#[derive(Debug, Copy, Eq, PartialEq, Clone)] +#[derive(Default, Debug, Copy, Eq, PartialEq, Clone)] pub enum TabItem { + #[default] Editor, QueryHistory, Context, Logs, } -impl Default for TabItem { - fn default() -> TabItem { - TabItem::Editor - } -} - impl TabItem { pub(crate) fn all_values() -> Vec { vec![ @@ -68,7 +63,7 @@ impl TabItem { } pub(crate) fn title_with_key(&self) -> String { - return format!("{} [{}]", self.title(), self.list_index() + 1); + format!("{} [{}]", self.title(), self.list_index() + 1) } pub(crate) fn title(&self) -> &'static str { @@ -109,19 +104,14 @@ impl From for usize { } } -#[derive(Debug, Copy, Clone)] +#[derive(Default, Debug, Copy, Clone)] pub enum InputMode { + #[default] Normal, Editing, Rc, } -impl Default for InputMode { - fn default() -> InputMode { - InputMode::Normal - } -} - /// Status that determines whether app should continue or exit #[derive(PartialEq)] pub enum AppReturn { diff --git a/src/app/editor/mod.rs b/src/app/editor/mod.rs index cd274a4..9240f3e 100644 --- a/src/app/editor/mod.rs +++ b/src/app/editor/mod.rs @@ -78,7 +78,7 @@ impl Input { self.current_row - MAX_EDITOR_LINES } as usize; - let end = (start + (MAX_EDITOR_LINES as usize) + 1) as usize; + let end = start + (MAX_EDITOR_LINES as usize) + 1; let text: Vec<&str> = if start == 0 { // debug!("Combining all lines"); diff --git a/src/cli/print_format.rs b/src/cli/print_format.rs index 85015b8..51e1b93 100644 --- a/src/cli/print_format.rs +++ b/src/cli/print_format.rs @@ -107,9 +107,9 @@ mod tests { let batch = RecordBatch::try_new( schema, vec![ - Arc::new(Int32Array::from_slice(&[1, 2, 3])), - Arc::new(Int32Array::from_slice(&[4, 5, 6])), - Arc::new(Int32Array::from_slice(&[7, 8, 9])), + Arc::new(Int32Array::from_slice([1, 2, 3])), + Arc::new(Int32Array::from_slice([4, 5, 6])), + Arc::new(Int32Array::from_slice([7, 8, 9])), ], ) .unwrap(); @@ -137,9 +137,9 @@ mod tests { let batch = RecordBatch::try_new( schema, vec![ - Arc::new(Int32Array::from_slice(&[1, 2, 3])), - Arc::new(Int32Array::from_slice(&[4, 5, 6])), - Arc::new(Int32Array::from_slice(&[7, 8, 9])), + Arc::new(Int32Array::from_slice([1, 2, 3])), + Arc::new(Int32Array::from_slice([4, 5, 6])), + Arc::new(Int32Array::from_slice([7, 8, 9])), ], ) .unwrap();