diff --git a/src/model/log.rs b/src/model/log.rs index 1026c44..9861760 100644 --- a/src/model/log.rs +++ b/src/model/log.rs @@ -46,6 +46,6 @@ LIMIT 1000 } ret.push_str(""); ret.push_str(""); - ret.replace("\n", "") + ret.replace('\n', "") } } diff --git a/src/model/mod.rs b/src/model/mod.rs index 73be211..4c428c9 100644 --- a/src/model/mod.rs +++ b/src/model/mod.rs @@ -33,17 +33,8 @@ impl Day { pub async fn new_guest(db: &SqlitePool, day: NaiveDate) -> Self { let mut day = Self::new(db, day).await; - day.planned_events = day - .planned_events - .into_iter() - .filter(|e| e.planned_event.allow_guests) - .collect(); - - day.trips = day - .trips - .into_iter() - .filter(|t| t.trip.allow_guests) - .collect(); + day.planned_events.retain(|e| e.planned_event.allow_guests); + day.trips.retain(|t| t.trip.allow_guests); day } diff --git a/src/model/planned_event.rs b/src/model/planned_event.rs index 24a74c5..4ca91a5 100644 --- a/src/model/planned_event.rs +++ b/src/model/planned_event.rs @@ -220,8 +220,8 @@ X-WR-CALNAME:Ruderausfahrten"#, res.push_str(&format!("\nUID:{}@rudernlinz.at", event.id)); res.push_str(&format!( "\nDTSTART;TZID=Europe/Vienna:{}T{}00", - event.day.replace("-", ""), - event.planned_starting_time.replace(":", "") + event.day.replace('-', ""), + event.planned_starting_time.replace(':', "") )); res.push_str(&format!("\nSUMMARY:{}", event.name)); diff --git a/src/model/trip.rs b/src/model/trip.rs index 92895e4..815e300 100644 --- a/src/model/trip.rs +++ b/src/model/trip.rs @@ -66,7 +66,7 @@ WHERE trip.id=? cox: &CoxUser, planned_event: &PlannedEvent, ) -> Result<(), CoxHelpError> { - if planned_event.is_rower_registered(db, &cox).await { + if planned_event.is_rower_registered(db, cox).await { return Err(CoxHelpError::AlreadyRegisteredAsRower); } diff --git a/src/model/user.rs b/src/model/user.rs index 9f3a94e..166aeec 100644 --- a/src/model/user.rs +++ b/src/model/user.rs @@ -115,7 +115,7 @@ ORDER BY name match user.pw.as_ref() { Some(user_pw) => { - let password_hash = &Self::get_hashed_pw(&pw); + let password_hash = &Self::get_hashed_pw(pw); if password_hash == user_pw { return Ok(user); } @@ -134,7 +134,7 @@ ORDER BY name } pub async fn update_pw(&self, db: &SqlitePool, pw: &str) { - let pw = Self::get_hashed_pw(&pw); + let pw = Self::get_hashed_pw(pw); sqlx::query!("UPDATE user SET pw = ? where id = ?", pw, self.id) .execute(db) .await