From 4e0195e132a66681f9387fb939bd9b25d09e71ec Mon Sep 17 00:00:00 2001 From: Joseph Ferano Date: Tue, 13 Jun 2023 23:00:28 +0700 Subject: [PATCH] Pedantic clippy --- src/app.rs | 2 +- src/db.rs | 6 +++++- src/input.rs | 10 ++++------ 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/app.rs b/src/app.rs index d589963..f0bd6c9 100644 --- a/src/app.rs +++ b/src/app.rs @@ -159,7 +159,7 @@ impl<'a> Column { } #[must_use] - pub fn get_task_state_from_curr_selected_task(&self) -> Option> { + pub fn get_task_state_from_current(&self) -> Option> { self.get_selected_task().map(|t| TaskState { title: TextArea::from(t.title.lines()), description: TextArea::from(t.description.lines()), diff --git a/src/db.rs b/src/db.rs index a4226d2..4c5f7a2 100644 --- a/src/db.rs +++ b/src/db.rs @@ -151,6 +151,7 @@ pub fn swap_task_order(conn: &mut Connection, task1: &Task, task2: &Task) { tx.commit().unwrap(); } +/// # Panics /// /// Panics if something goes wrong with the SQL pub fn set_selected_column(conn: &Connection, column_id: usize) { @@ -161,19 +162,21 @@ pub fn set_selected_column(conn: &Connection, column_id: usize) { .unwrap(); } +/// # Panics /// /// Panics if something goes wrong with the SQL pub fn get_selected_column(conn: &Connection) -> usize { let mut stmt = conn .prepare("select value from app_state where key = ?1") .unwrap(); - stmt.query_row(&["selected_column"], |row| { + stmt.query_row(["selected_column"], |row| { let value: String = row.get::(0).unwrap(); Ok(value.parse::().unwrap()) }) .unwrap() } +/// # Panics /// /// Panics if something goes wrong with the SQL pub fn set_selected_task_for_column(conn: &Connection, task_idx: usize, column_id: i32) { @@ -183,6 +186,7 @@ pub fn set_selected_task_for_column(conn: &Connection, task_idx: usize, column_i stmt.execute((column_id, task_idx)).unwrap(); } +/// # Panics /// /// Panics if something goes wrong with the SQL pub fn get_selected_task_for_column(conn: &Connection, column_id: i32) -> usize { diff --git a/src/input.rs b/src/input.rs index 06f066d..bbf1209 100644 --- a/src/input.rs +++ b/src/input.rs @@ -146,9 +146,7 @@ pub fn handle_main(state: &mut State<'_>, key: event::KeyEvent) { } } KeyCode::Char('n') => state.task_edit_state = Some(TaskState::default()), - KeyCode::Char('e') => { - state.task_edit_state = column.get_task_state_from_curr_selected_task(); - } + KeyCode::Char('e') => state.task_edit_state = column.get_task_state_from_current(), KeyCode::Char('D') => { if !column.tasks.is_empty() { db::delete_task(&state.db_conn, column.get_selected_task().unwrap()); @@ -173,9 +171,9 @@ pub fn handle_main(state: &mut State<'_>, key: event::KeyEvent) { /// Shouldn't really panic because there are checks to ensure we can unwrap safely pub fn handle(state: &mut State<'_>) -> Result<(), std::io::Error> { if let Event::Key(key) = event::read()? { - if let Some(_) = state.task_edit_state { - let mut column = state.project.get_selected_column_mut(); - handle_task_edit(&state.db_conn, &mut column, key, &mut state.task_edit_state); + if state.task_edit_state.is_some() { + let column = state.project.get_selected_column_mut(); + handle_task_edit(&state.db_conn, column, key, &mut state.task_edit_state); } else { handle_main(state, key); }