operations: Replace unwrap_or_else with if let Err

src/operations/clean.rs

@@ -49,19 +49,20 @@ pub async fn clean(options: Options) {
         tracing::debug!("Removing orphans: {:?}", orphaned_packages_vec);
 
         // Remove orphaned packages
-        PacmanUninstallBuilder::default()
+        let result = PacmanUninstallBuilder::default()
             .no_save(true)
             .recursive(true)
             .no_confirm(noconfirm)
             .packages(orphaned_packages_vec)
             .uninstall()
-            .await
+            .await;
-            .unwrap_or_else(|_| {
-                crash!(AppExitCode::PacmanError, "Failed to remove orphans",);
-            });
 
+        if let Err(_) = result {
+            crash!(AppExitCode::PacmanError, "Failed to remove orphans");
+        } else {
             tracing::info!("Successfully removed orphans");
         }
+    }
 
     // Prompt the user whether to clear the Amethyst cache
     let clear_ame_cache = prompt!(default no, "Clear Amethyst's internal PKGBUILD cache?");
@@ -89,20 +90,21 @@ pub async fn clean(options: Options) {
         // Clear pacman's cache
         // keeps 0 versions of the package in the cache by default
         // keeps installed packages in the cache by default
-        PaccacheBuilder::default()
+        let result = PaccacheBuilder::default()
             .keep(conf.base.paccache_keep)
             .keep_ins(conf.base.paccache_keep_ins)
             .quiet(quiet)
             .remove()
-            .await
+            .await;
-            .unwrap_or_else(|e| {
+
+        if let Err(e) = result {
             crash!(
                 AppExitCode::PacmanError,
                 "Failed to clear package cache, {}",
                 e
             )
-            });
+        } else {
-
             tracing::info!("Successfully cleared package cache");
         }
+    }
 }

src/operations/upgrade.rs

@@ -28,11 +28,12 @@ async fn upgrade_repo(options: Options) {
 
     tracing::debug!("Upgrading repo packages");
 
-    PacmanUpgradeBuilder::default()
+    let result = PacmanUpgradeBuilder::default()
         .no_confirm(noconfirm)
         .upgrade()
-        .await
+        .await;
-        .unwrap_or_else(|_| {
+
+    if let Err(_) = result {
         let continue_upgrading = prompt!(default no,
             "Failed to upgrade repo packages, continue to upgrading AUR packages?",
         );
@@ -40,8 +41,9 @@ async fn upgrade_repo(options: Options) {
             tracing::info!("Exiting");
             std::process::exit(AppExitCode::PacmanError as i32);
         }
-        });
+    } else {
         tracing::info!("Successfully upgraded repo packages");
+    }
 }
 
 #[tracing::instrument(level = "trace")]