more clippy :-)

src/model/logbook.rs

@@ -101,7 +101,7 @@ impl Logbook {
                 boat: Boat::find_by_id(db, log.boat_id as i32).await.unwrap(),
                 shipmaster_user: User::find_by_id(db, log.shipmaster as i32).await.unwrap(),
                 logbook: log,
-            })
+            });
         }
         ret
     }
@@ -127,18 +127,15 @@ impl Logbook {
                 boat: Boat::find_by_id(db, log.boat_id as i32).await.unwrap(),
                 shipmaster_user: User::find_by_id(db, log.shipmaster as i32).await.unwrap(),
                 logbook: log,
-            })
+            });
         }
         ret
     }
 
     pub async fn create(db: &SqlitePool, log: LogToAdd) -> Result<(), LogbookCreateError> {
-        let boat = match Boat::find_by_id(db, log.boat_id).await {
+        let Some(boat) = Boat::find_by_id(db, log.boat_id).await else {
-            Some(b) => b,
+                 return Err(LogbookCreateError::BoatNotFound);
-            None => {
+             };
-                return Err(LogbookCreateError::BoatNotFound);
-            }
-        };
 
         if boat.is_locked(db).await {
             return Err(LogbookCreateError::BoatLocked);

src/model/mod.rs

@@ -31,19 +31,20 @@ pub struct Day {
 
 impl Day {
     pub async fn new(db: &SqlitePool, day: NaiveDate, is_pinned: bool) -> Self {
-        let planned_events = match is_pinned {
+        if is_pinned {
-            true => PlannedEvent::get_pinned_for_day(db, day).await,
+            Self {
-            false => PlannedEvent::get_for_day(db, day).await,
+                day,
-        };
+                planned_events: PlannedEvent::get_pinned_for_day(db, day).await,
-        let trips = match is_pinned {
+                trips: Trip::get_pinned_for_day(db, day).await,
-            true => Trip::get_pinned_for_day(db, day).await,
+                is_pinned,
-            false => Trip::get_for_day(db, day).await,
+            }
-        };
+        } else {
-        Self {
+            Self {
-            day,
+                day,
-            planned_events,
+                planned_events: PlannedEvent::get_for_day(db, day).await,
-            trips,
+                trips: Trip::get_for_day(db, day).await,
-            is_pinned,
+                is_pinned,
+            }
         }
     }
     pub async fn new_guest(db: &SqlitePool, day: NaiveDate, is_pinned: bool) -> Self {

src/model/user.rs

@@ -161,20 +161,17 @@ ORDER BY last_access DESC
                                                                 //been deleted
         }
 
-        match user.pw.as_ref() {
+        if let Some(user_pw) = 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 {
-                if password_hash == user_pw {
+                Log::create(db, format!("User {name} successfully logged in")).await;
-                    Log::create(db, format!("User {name} successfully logged in")).await;
+                return Ok(user);
-                    return Ok(user);
-                }
-                Log::create(db, format!("User {name} supplied the wrong PW")).await;
-                Err(LoginError::InvalidAuthenticationCombo)
-            }
-            None => {
-                info!("User {name} has no PW set");
-                Err(LoginError::NoPasswordSet(user))
             }
+            Log::create(db, format!("User {name} supplied the wrong PW")).await;
+            Err(LoginError::InvalidAuthenticationCombo)
+        } else {
+            info!("User {name} has no PW set");
+            Err(LoginError::NoPasswordSet(user))
         }
     }
 

src/tera/auth.rs

@@ -113,7 +113,7 @@ async fn updatepw(
 }
 
 #[get("/logout")]
-fn logout(cookies: &CookieJar<'_>, _user: User) -> Flash<Redirect> {
+fn logout(cookies: &CookieJar<'_>, _user: &User) -> Flash<Redirect> {
     cookies.remove_private(Cookie::named("loggedin_user"));
 
     Flash::success(Redirect::to("/auth"), "Logout erfolgreich")

src/tera/log.rs

@@ -71,7 +71,7 @@ async fn home(
     db: &State<SqlitePool>,
     data: Form<LogToFinalize>,
     logbook_id: i32,
-    _adminuser: AdminUser,
+    adminuser: AdminUser,
 ) -> Flash<Redirect> {
     let logbook = Logbook::find_by_id(db, logbook_id).await;
     let Some(logbook) = logbook else {
@@ -81,7 +81,7 @@ async fn home(
             )
     };
 
-    match logbook.home(db, &_adminuser.user, data.into_inner()).await {
+    match logbook.home(db, &adminuser.user, data.into_inner()).await {
         Ok(_) => Flash::success(Redirect::to("/log"), "Successfully updated log"),
         Err(_) => Flash::error(
             Redirect::to("/log"),