diff --git a/db/src/models/event_for_calendar.rs b/db/src/models/event_for_calendar.rs index aa5123b4..ded2b04f 100644 --- a/db/src/models/event_for_calendar.rs +++ b/db/src/models/event_for_calendar.rs @@ -58,12 +58,12 @@ impl EventForCalendar { assignments: record .assignments .as_ref() - .and_then(|f| Some(f.to_vec())) + .map(|f| f.to_vec()) .unwrap_or_default(), vehicle_assignments: record .vehicles .as_ref() - .and_then(|f| Some(f.to_vec())) + .map(|f| f.to_vec()) .unwrap_or_default(), }) .collect(); diff --git a/web/src/endpoints/availability/put_cross_areal.rs b/web/src/endpoints/availability/put_cross_areal.rs index 747b9a76..9a6f3cc6 100644 --- a/web/src/endpoints/availability/put_cross_areal.rs +++ b/web/src/endpoints/availability/put_cross_areal.rs @@ -64,7 +64,7 @@ async fn handle_cross_areal( let assignments_for_availability = Assignment::read_all_by_availability(pool.get_ref(), availability.id).await?; - if !cross_areal && assignments_for_availability.len() != 0 { + if !cross_areal && !assignments_for_availability.is_empty() { let trigger = json!({ "showToast": { "type": "danger", diff --git a/web/src/mail/notify_planned.rs b/web/src/mail/notify_planned.rs index a93f3bf4..2999ddba 100644 --- a/web/src/mail/notify_planned.rs +++ b/web/src/mail/notify_planned.rs @@ -25,7 +25,7 @@ impl Mailer { &self.hostname, &user.name, &user.email, - &assigned_function, + assigned_function, event, )?; self.transport.send(message).await?; diff --git a/web/src/mail/notify_unplanned.rs b/web/src/mail/notify_unplanned.rs index 4cc6eba1..ce71c9ea 100644 --- a/web/src/mail/notify_unplanned.rs +++ b/web/src/mail/notify_unplanned.rs @@ -25,7 +25,7 @@ impl Mailer { &self.hostname, &user.name, &user.email, - &assigned_function, + assigned_function, event, )?; self.transport.send(message).await?; diff --git a/web/src/utils/password_change/builder.rs b/web/src/utils/password_change/builder.rs index 84c57171..a101e290 100644 --- a/web/src/utils/password_change/builder.rs +++ b/web/src/utils/password_change/builder.rs @@ -49,7 +49,7 @@ where self } - pub fn build<'a>(&'a mut self) -> PasswordChange<'a, T> { + pub fn build(&mut self) -> PasswordChange { PasswordChange { pool: self.pool, user_id: self.user_id,