From ab979909e4f264d4f34d8b7fc8b6f51c52bd0a42 Mon Sep 17 00:00:00 2001
From: Tobias Bieniek <tobias@bieniek.cloud>
Date: Fri, 4 Oct 2024 17:09:11 +0200
Subject: [PATCH] admin/dialoguer: Remove `.unwrap()` call from `confirm()` fn

---
 src/admin/delete_crate.rs    | 2 +-
 src/admin/delete_version.rs  | 2 +-
 src/admin/dialoguer.rs       | 3 +--
 src/admin/transfer_crates.rs | 6 +++---
 src/admin/upload_index.rs    | 2 +-
 src/admin/yank_version.rs    | 2 +-
 6 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/admin/delete_crate.rs b/src/admin/delete_crate.rs
index 617a291d8b1..1b7c23c5f12 100644
--- a/src/admin/delete_crate.rs
+++ b/src/admin/delete_crate.rs
@@ -70,7 +70,7 @@ pub async fn run(opts: Opts) -> anyhow::Result<()> {
         }
         println!();
 
-        if !opts.yes && !dialoguer::confirm("Do you want to permanently delete these crates?") {
+        if !opts.yes && !dialoguer::confirm("Do you want to permanently delete these crates?")? {
             return Ok(());
         }
 
diff --git a/src/admin/delete_version.rs b/src/admin/delete_version.rs
index 8c3f2f26479..1e004cc569e 100644
--- a/src/admin/delete_version.rs
+++ b/src/admin/delete_version.rs
@@ -47,7 +47,7 @@ pub async fn run(opts: Opts) -> anyhow::Result<()> {
         }
         println!();
 
-        if !opts.yes && !dialoguer::confirm("Do you want to permanently delete these versions?") {
+        if !opts.yes && !dialoguer::confirm("Do you want to permanently delete these versions?")? {
             return Ok(());
         }
 
diff --git a/src/admin/dialoguer.rs b/src/admin/dialoguer.rs
index 14232a01aa4..9701e6fb3ca 100644
--- a/src/admin/dialoguer.rs
+++ b/src/admin/dialoguer.rs
@@ -1,12 +1,11 @@
 use ::dialoguer::{theme::Theme, Confirm};
 
-pub fn confirm(msg: &str) -> bool {
+pub fn confirm(msg: &str) -> dialoguer::Result<bool> {
     Confirm::with_theme(&CustomTheme)
         .with_prompt(msg)
         .default(false)
         .wait_for_newline(true)
         .interact()
-        .unwrap()
 }
 
 #[derive(Debug, Copy, Clone)]
diff --git a/src/admin/transfer_crates.rs b/src/admin/transfer_crates.rs
index 2dec50d5bb8..cc1a74955cd 100644
--- a/src/admin/transfer_crates.rs
+++ b/src/admin/transfer_crates.rs
@@ -47,7 +47,7 @@ fn transfer(opts: Opts, conn: &mut PgConnection) -> anyhow::Result<()> {
         println!("from: {:?}", from.gh_id);
         println!("to:   {:?}", to.gh_id);
 
-        if !dialoguer::confirm("continue?") {
+        if !dialoguer::confirm("continue?")? {
             return Ok(());
         }
     }
@@ -56,7 +56,7 @@ fn transfer(opts: Opts, conn: &mut PgConnection) -> anyhow::Result<()> {
         "Are you sure you want to transfer crates from {} to {}?",
         from.gh_login, to.gh_login
     );
-    if !dialoguer::confirm(&prompt) {
+    if !dialoguer::confirm(&prompt)? {
         return Ok(());
     }
 
@@ -74,7 +74,7 @@ fn transfer(opts: Opts, conn: &mut PgConnection) -> anyhow::Result<()> {
         }
     }
 
-    if !dialoguer::confirm("commit?") {
+    if !dialoguer::confirm("commit?")? {
         return Ok(());
     }
 
diff --git a/src/admin/upload_index.rs b/src/admin/upload_index.rs
index 6a8afe61f9a..fd99bb461a4 100644
--- a/src/admin/upload_index.rs
+++ b/src/admin/upload_index.rs
@@ -27,7 +27,7 @@ pub async fn run(opts: Opts) -> anyhow::Result<()> {
 
         let files = repo.get_files_modified_since(opts.incremental_commit.as_deref())?;
         println!("found {} files to upload", files.len());
-        if !dialoguer::confirm("continue with upload?") {
+        if !dialoguer::confirm("continue with upload?")? {
             return Ok(());
         }
 
diff --git a/src/admin/yank_version.rs b/src/admin/yank_version.rs
index b9c726213cf..0d7b66075ad 100644
--- a/src/admin/yank_version.rs
+++ b/src/admin/yank_version.rs
@@ -53,7 +53,7 @@ fn yank(opts: Opts, conn: &mut PgConnection) -> anyhow::Result<()> {
             "Are you sure you want to yank {crate_name}#{version} ({})?",
             v.id
         );
-        if !dialoguer::confirm(&prompt) {
+        if !dialoguer::confirm(&prompt)? {
             return Ok(());
         }
     }