fix: linter errors

Author: josecelano

src/models/torrent_file.rs

@@ -80,21 +80,19 @@ impl Torrent {
         torrent_nodes: Vec<(String, i64)>,
     ) -> Self {
         let pieces_or_root_hash = if db_torrent.is_bep_30 == 0 {
-            match &db_torrent.pieces {
-                Some(pieces) => pieces.clone(),
-                None => {
-                    error!("Invalid torrent #{}. Null `pieces` in database", db_torrent.torrent_id);
-                    String::new()
-                }
+            if let Some(pieces) = &db_torrent.pieces {
+                pieces.clone()
+            } else {
+                error!("Invalid torrent #{}. Null `pieces` in database", db_torrent.torrent_id);
+                String::new()
             }
         } else {
             // A BEP-30 torrent
-            match &db_torrent.root_hash {
-                Some(root_hash) => root_hash.clone(),
-                None => {
-                    error!("Invalid torrent #{}. Null `root_hash` in database", db_torrent.torrent_id);
-                    String::new()
-                }
+            if let Some(root_hash) = &db_torrent.root_hash {
+                root_hash.clone()
+            } else {
+                error!("Invalid torrent #{}. Null `root_hash` in database", db_torrent.torrent_id);
+                String::new()
             }
         };
 

src/services/user.rs

@@ -134,24 +134,21 @@ impl RegistrationService {
                     drop(self.user_repository.grant_admin_role(&user_id).await);
                 }
 
-                match &registration.email {
-                    Some(email) => {
-                        if email.verification_required {
-                            // Email verification is enabled
-                            if let Some(email) = opt_email {
-                                let mail_res = self
-                                    .mailer
-                                    .send_verification_mail(&email, &registration_form.username, user_id, api_base_url)
-                                    .await;
-
-                                if mail_res.is_err() {
-                                    drop(self.user_repository.delete(&user_id).await);
-                                    return Err(ServiceError::FailedToSendVerificationEmail);
-                                }
+                if let Some(email) = &registration.email {
+                    if email.verification_required {
+                        // Email verification is enabled
+                        if let Some(email) = opt_email {
+                            let mail_res = self
+                                .mailer
+                                .send_verification_mail(&email, &registration_form.username, user_id, api_base_url)
+                                .await;
+
+                            if mail_res.is_err() {
+                                drop(self.user_repository.delete(&user_id).await);
+                                return Err(ServiceError::FailedToSendVerificationEmail);
                             }
                         }
                     }
-                    None => (),
                 }
 
                 Ok(user_id)

src/web/api/server/mod.rs

@@ -126,33 +126,30 @@ pub enum Error {
 }
 
 pub async fn make_rust_tls(tsl_config: &Option<Tsl>) -> Option<Result<RustlsConfig, Error>> {
-    match tsl_config {
-        Some(tsl) => {
-            if let (Some(cert), Some(key)) = (tsl.ssl_cert_path.clone(), tsl.ssl_key_path.clone()) {
-                info!("Using https. Cert path: {cert}.");
-                info!("Using https. Key path: {key}.");
-
-                let ssl_cert_path = cert.clone().to_string();
-                let ssl_key_path = key.clone().to_string();
-
-                Some(
-                    RustlsConfig::from_pem_file(cert, key)
-                        .await
-                        .map_err(|err| Error::BadTlsConfig {
-                            source: (Arc::new(err) as DynError).into(),
-                            ssl_cert_path,
-                            ssl_key_path,
-                        }),
-                )
-            } else {
-                Some(Err(Error::MissingTlsConfig {
-                    location: Location::caller(),
-                }))
-            }
-        }
-        None => {
-            info!("TLS not enabled");
-            None
+    if let Some(tsl) = tsl_config {
+        if let (Some(cert), Some(key)) = (tsl.ssl_cert_path.clone(), tsl.ssl_key_path.clone()) {
+            info!("Using https. Cert path: {cert}.");
+            info!("Using https. Key path: {key}.");
+
+            let ssl_cert_path = cert.clone().to_string();
+            let ssl_key_path = key.clone().to_string();
+
+            Some(
+                RustlsConfig::from_pem_file(cert, key)
+                    .await
+                    .map_err(|err| Error::BadTlsConfig {
+                        source: (Arc::new(err) as DynError).into(),
+                        ssl_cert_path,
+                        ssl_key_path,
+                    }),
+            )
+        } else {
+            Some(Err(Error::MissingTlsConfig {
+                location: Location::caller(),
+            }))
         }
+    } else {
+        info!("TLS not enabled");
+        None
     }
 }

tests/environments/app_starter.rs

@@ -68,12 +68,9 @@ impl AppStarter {
     }
 
     pub fn stop(&mut self) {
-        match &self.running_state {
-            Some(running_state) => {
-                running_state.app_handle.abort();
-                self.running_state = None;
-            }
-            None => {}
+        if let Some(running_state) = &self.running_state {
+            running_state.app_handle.abort();
+            self.running_state = None;
         }
     }