backend: fix cargo clippy + fmt

Author: ffreddow

backend/src/branding.rs

@@ -1,31 +1,31 @@
 /// Branding configuration for the application
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Default)]
 pub enum Brand {
+    #[default]
     Warp,
     Seb,
 }
 
 impl Brand {
     /// Parse brand from environment variable or string
     pub fn from_env() -> Self {
+        use std::str::FromStr;
+
         std::env::var("BRAND")
             .ok()
-            .and_then(|s| Self::from_str(&s))
+            .and_then(|s| Self::from_str(&s).ok())
             .unwrap_or(Brand::Warp)
     }
+}
+
+impl std::str::FromStr for Brand {
+    type Err = ();
 
-    /// Parse brand from string
-    pub fn from_str(s: &str) -> Option<Self> {
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
         match s.to_lowercase().as_str() {
-            "seb" => Some(Brand::Seb),
-            "warp" => Some(Brand::Warp),
-            _ => None,
+            "seb" => Ok(Brand::Seb),
+            "warp" => Ok(Brand::Warp),
+            _ => Err(()),
         }
     }
 }
-
-impl Default for Brand {
-    fn default() -> Self {
-        Brand::Warp
-    }
-}

backend/src/routes/auth/register.rs

@@ -32,7 +32,11 @@ use utoipa::ToSchema;
 use validator::Validate;
 
 use crate::{
-    AppState, branding, error::Error, routes::auth::VERIFICATION_EXPIRATION_DAYS, utils::{self, get_connection}
+    branding,
+    error::Error,
+    routes::auth::VERIFICATION_EXPIRATION_DAYS,
+    utils::{self, get_connection},
+    AppState,
 };
 
 #[derive(Template)]

backend/src/routes/auth/resend_verification.rs

@@ -6,7 +6,11 @@ use serde::{Deserialize, Serialize};
 use utoipa::ToSchema;
 
 use crate::{
-    AppState, branding, error::Error, routes::auth::VERIFICATION_EXPIRATION_DAYS, utils::{get_connection, web_block_unpacked}
+    branding,
+    error::Error,
+    routes::auth::VERIFICATION_EXPIRATION_DAYS,
+    utils::{get_connection, web_block_unpacked},
+    AppState,
 };
 
 use db_connector::models::{users::User, verification::Verification};

backend/src/routes/auth/start_recovery.rs

@@ -7,7 +7,11 @@ use utoipa::IntoParams;
 use uuid::Uuid;
 
 use crate::{
-    AppState, branding, error::Error, routes::user::{get_user, get_user_id}, utils::{self, get_connection, web_block_unpacked}
+    branding,
+    error::Error,
+    routes::user::{get_user, get_user_id},
+    utils::{self, get_connection, web_block_unpacked},
+    AppState,
 };
 
 #[derive(Deserialize, IntoParams)]

backend/src/routes/send_chargelog_to_user.rs

@@ -6,7 +6,12 @@ use std::io::Read;
 use utoipa::ToSchema;
 
 use crate::{
-    AppState, branding, error::Error, rate_limit::ChargerRateLimiter, routes::{charger::add::password_matches, user::get_user}, utils::{get_charger_from_db, parse_uuid, send_email_with_attachment}
+    branding,
+    error::Error,
+    rate_limit::ChargerRateLimiter,
+    routes::{charger::add::password_matches, user::get_user},
+    utils::{get_charger_from_db, parse_uuid, send_email_with_attachment},
+    AppState,
 };
 
 #[derive(Serialize, Deserialize, ToSchema)]

backend/src/routes/user/update_user.rs

@@ -18,7 +18,11 @@
  */
 
 use crate::{
-    AppState, branding, error::Error, routes::auth::VERIFICATION_EXPIRATION_DAYS, utils::{get_connection, send_email, web_block_unpacked}
+    branding,
+    error::Error,
+    routes::auth::VERIFICATION_EXPIRATION_DAYS,
+    utils::{get_connection, send_email, web_block_unpacked},
+    AppState,
 };
 use actix_web::{error::ErrorConflict, put, web, HttpResponse, Responder};
 use askama::Template;