From 17f2985bb7633b172f8f164b5315fe74789a625f Mon Sep 17 00:00:00 2001
From: Julian Mutter <julian.mutter@comumail.de>
Date: Sun, 11 Feb 2024 09:38:42 +0100
Subject: [PATCH] Run cargo and clippy fix

---
 src/sheet_dao.rs      | 19 ++++++++-----------
 src/ui/sheet_model.rs |  2 +-
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/src/sheet_dao.rs b/src/sheet_dao.rs
index 7b5409b..7162023 100644
--- a/src/sheet_dao.rs
+++ b/src/sheet_dao.rs
@@ -1,14 +1,11 @@
-use std::path::{Path, PathBuf};
-use strum::{EnumMessage, IntoEnumIterator};
-use strum_macros::{EnumDiscriminants, EnumIter, EnumString};
-
-use chrono::{DateTime, NaiveDateTime, Utc};
-use sqlx::{sqlite::SqliteRow, Row, SqlitePool};
-
 use crate::{
     database::Database,
     sheet::{I64DateTime, Pdf, Sheet, SheetKind, SheetKindDiscriminants},
 };
+use chrono::{DateTime, Utc};
+use sqlx::{sqlite::SqliteRow, Row};
+use std::path::{Path, PathBuf};
+use strum::IntoEnumIterator;
 
 pub async fn insert_file_as_orphan(
     database: &Database,
@@ -53,12 +50,12 @@ pub async fn update_sheet_path(database: &Database, sheet: &Sheet) -> sqlx::Resu
     // TODO: when updating book or sheet of book, update all
     let sheet_kind = SheetKindDiscriminants::from(&sheet.kind);
     let table = sheet_kind.get_database_table_name();
-    return sqlx::query(&format!("UPDATE {} SET path = $1 WHERE id = $2", table))
+    sqlx::query(&format!("UPDATE {} SET path = $1 WHERE id = $2", table))
         .bind(sheet.pdf.path.to_str().unwrap().to_string())
         .bind(sheet.id)
         .execute(&database.connection)
         .await
-        .map(|_| ());
+        .map(|_| ())
 }
 
 pub async fn update_sheet_last_opened(database: &Database, sheet: &Sheet) -> sqlx::Result<()> {
@@ -117,8 +114,8 @@ fn parse_kind_from_row(kind: SheetKindDiscriminants, row: SqliteRow) -> sqlx::Re
 
 fn sheet_ids_from_string(s: String) -> Vec<i64> {
     s.trim()
-        .split(",")
-        .map(|s| i64::from_str_radix(s, 10).unwrap())
+        .split(',')
+        .map(|s| s.parse::<i64>().unwrap())
         .collect()
 }
 
diff --git a/src/ui/sheet_model.rs b/src/ui/sheet_model.rs
index 3c29127..8650617 100644
--- a/src/ui/sheet_model.rs
+++ b/src/ui/sheet_model.rs
@@ -1,4 +1,4 @@
-use std::{cmp::Ordering, path::Path};
+
 
 use gtk::prelude::*;
 use relm4::prelude::*;