From 467a98af4329ecfc7b61833a0a1f64956ef9454f Mon Sep 17 00:00:00 2001 From: Tobias Reisinger Date: Sun, 17 Jul 2022 21:01:32 +0200 Subject: [PATCH] Fix clippy warnings --- src/db/model_utils.rs | 4 ++-- src/db/schedules.rs | 7 +------ 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/src/db/model_utils.rs b/src/db/model_utils.rs index 057e63d..3e1ced1 100644 --- a/src/db/model_utils.rs +++ b/src/db/model_utils.rs @@ -22,7 +22,7 @@ mod period_format { use chrono::NaiveTime; use serde::{self, Deserialize, Deserializer, Serializer}; - const FORMAT: &'static str = "%H:%M"; + const FORMAT: &str = "%H:%M"; pub fn serialize(time: &NaiveTime, serializer: S) -> Result where @@ -64,7 +64,7 @@ impl FromSql for Periods { let start_val_h: u32 = blob[i - 3] as u32; let start_val_m: u32 = blob[i - 2] as u32; let end_val_h: u32 = blob[i - 1] as u32; - let end_val_m: u32 = blob[i - 0] as u32; + let end_val_m: u32 = blob[i] as u32; vec.push(Period { start: NaiveTime::from_hms(start_val_h, start_val_m, 0), end: NaiveTime::from_hms(end_val_h, end_val_m, 0), diff --git a/src/db/schedules.rs b/src/db/schedules.rs index 5fa8a33..5ca2dfd 100644 --- a/src/db/schedules.rs +++ b/src/db/schedules.rs @@ -125,14 +125,9 @@ pub fn set_schedule_tags(schedule: &Schedule, new_tags: &[String]) -> Result<(), .load::(&connection) .expect("Error loading tags"); - let database_tags_str: Vec = database_tags - .iter() - .map(|tag_db| tag_db.tag.clone()) - .collect(); - // create missing tags for new_tag in new_tags { - if !database_tags_str.contains(new_tag) { + if !database_tags.iter().any(|tab_db| tab_db.tag.eq(new_tag)) { database_tags.push(create_tag(new_tag).expect("Error inserting tag")); } }