1 files changed, 18 insertions, 28 deletions

diff --git a/src/bin/rbw-agent/actions.rs b/src/bin/rbw-agent/actions.rs
index 1cc71c3..87a8276 100644
--- a/src/bin/rbw-agent/actions.rs
+++ b/src/bin/rbw-agent/actions.rs
@@ -61,10 +61,9 @@ pub async fn register(
                             message,
                         })
                         .context("failed to log in to bitwarden instance");
-                    } else {
-                        err_msg = Some(message);
-                        continue;
                     }
+                    err_msg = Some(message);
+                    continue;
                 }
                 Err(e) => {
                     return Err(e)
@@ -172,9 +171,8 @@ pub async fn login(
                         )
                         .await?;
                         break;
-                    } else {
-                        return Err(anyhow::anyhow!("TODO"));
                     }
+                    return Err(anyhow::anyhow!("TODO"));
                 }
                 Err(rbw::error::Error::IncorrectPassword { message }) => {
                     if i == 3 {
@@ -182,10 +180,9 @@ pub async fn login(
                             message,
                         })
                         .context("failed to log in to bitwarden instance");
-                    } else {
-                        err_msg = Some(message);
-                        continue;
                     }
+                    err_msg = Some(message);
+                    continue;
                 }
                 Err(e) => {
                     return Err(e)
@@ -249,10 +246,9 @@ async fn two_factor(
                         message,
                     })
                     .context("failed to log in to bitwarden instance");
-                } else {
-                    err_msg = Some(message);
-                    continue;
                 }
+                err_msg = Some(message);
+                continue;
             }
             // can get this if the user passes an empty string
             Err(rbw::error::Error::TwoFactorRequired { .. }) => {
@@ -262,10 +258,9 @@ async fn two_factor(
                         message,
                     })
                     .context("failed to log in to bitwarden instance");
-                } else {
-                    err_msg = Some(message);
-                    continue;
                 }
+                err_msg = Some(message);
+                continue;
             }
             Err(e) => {
                 return Err(e)
@@ -313,8 +308,7 @@ async fn login_success(
         &protected_key,
         &protected_private_key,
         &db.protected_org_keys,
-    )
-    .await;
+    );
 
     match res {
         Ok((keys, org_keys)) => {
@@ -362,7 +356,7 @@ pub async fn unlock(
         let email = config_email().await?;
 
         let mut err_msg = None;
-        for i in 1u8..=3 {
+        for i in 1_u8..=3 {
             let err = if i > 1 {
                 // this unwrap is safe because we only ever continue the loop
                 // if we have set err_msg
@@ -387,9 +381,7 @@ pub async fn unlock(
                 &protected_key,
                 &protected_private_key,
                 &db.protected_org_keys,
-            )
-            .await
-            {
+            ) {
                 Ok((keys, org_keys)) => {
                     unlock_success(state, keys, org_keys).await?;
                     break;
@@ -400,10 +392,9 @@ pub async fn unlock(
                             message,
                         })
                         .context("failed to unlock database");
-                    } else {
-                        err_msg = Some(message);
-                        continue;
                     }
+                    err_msg = Some(message);
+                    continue;
                 }
                 Err(e) => return Err(e).context("failed to unlock database"),
             }
@@ -579,11 +570,10 @@ async fn respond_encrypt(
 
 async fn config_email() -> anyhow::Result<String> {
     let config = rbw::config::Config::load_async().await?;
-    if let Some(email) = config.email {
-        Ok(email)
-    } else {
-        Err(anyhow::anyhow!("failed to find email address in config"))
-    }
+    config.email.map_or_else(
+        || Err(anyhow::anyhow!("failed to find email address in config")),
+        Ok,
+    )
 }
 
 async fn load_db() -> anyhow::Result<rbw::db::Db> {