From b2bf065a2b959d8ccc7b9e76a43038d81bf45514 Mon Sep 17 00:00:00 2001 From: Jiahao XU Date: Fri, 10 Jun 2022 13:32:28 +1000 Subject: [PATCH] Rm unused fn `helpers::confirm::confirm` Signed-off-by: Jiahao XU --- src/helpers.rs | 2 +- src/helpers/confirm.rs | 18 ------------------ 2 files changed, 1 insertion(+), 19 deletions(-) diff --git a/src/helpers.rs b/src/helpers.rs index a55b6a37..0266b89a 100644 --- a/src/helpers.rs +++ b/src/helpers.rs @@ -20,7 +20,7 @@ mod auto_abort_join_handle; pub use auto_abort_join_handle::AutoAbortJoinHandle; mod confirm; -pub use confirm::{confirm, Confirmer}; +pub use confirm::Confirmer; mod extracter; mod readable_rx; diff --git a/src/helpers/confirm.rs b/src/helpers/confirm.rs index 30102aa4..568be460 100644 --- a/src/helpers/confirm.rs +++ b/src/helpers/confirm.rs @@ -1,28 +1,10 @@ use std::io::{self, BufRead, Write}; -use log::info; use tokio::sync::mpsc; use tokio::task::spawn_blocking; use crate::BinstallError; -pub fn confirm() -> Result<(), BinstallError> { - loop { - info!("Do you wish to continue? yes/[no]"); - eprint!("? "); - io::stderr().flush().ok(); - - let mut input = String::new(); - io::stdin().read_line(&mut input).unwrap(); - - match input.as_str().trim() { - "yes" | "y" | "YES" | "Y" => break Ok(()), - "no" | "n" | "NO" | "N" | "" => break Err(BinstallError::UserAbort), - _ => continue, - } - } -} - #[derive(Debug)] struct ConfirmerInner { /// Request for confirmation