bhcli

commit 09cb373aa565d44a37e16f9ba1283e641ac95b6c
parent 52b76291e696ccf0bc356b43a90fd7f800f3b2d5
Author: n0tr1v <n0tr1v@protonmail.com>
Date:   Mon, 27 Mar 2023 16:11:24 -0700

cleanup

Diffstat:
M
src/main.rs
 | 
29
++++++++++++-----------------

1 file changed, 12 insertions(+), 17 deletions(-)
diff --git a/src/main.rs b/src/main.rs
@@ -34,7 +34,6 @@ use std::error;
 use std::fs;
 use std::io::Cursor;
 use std::io::{self, Write};
-use std::process;
 use std::sync::Arc;
 use std::sync::Mutex;
 use std::thread;
@@ -284,7 +283,7 @@ impl<'a> LeChatPHPClient<'a> {
                 break;
             }
             self.session = "".to_owned();
-            let retry_in = time::Duration::from_secs(2);
+            let retry_in = Duration::from_secs(2);
             let mut msg = format!("retry login in {:?}, attempt: {}", retry_in, attempt);
             if max_retry > 0 {
                 msg += &format!("/{}", max_retry);
@@ -2006,24 +2005,20 @@ fn get_tor_client(socks_proxy_url: &str) -> Client {
 }
 
 fn ask_username(username: Option<String>) -> String {
-    match username {
-        Some(u) => u,
-        None => {
-            print!("username: ");
-            let mut username_input = String::new();
-            io::stdout().flush().unwrap();
-            io::stdin().read_line(&mut username_input).unwrap();
-            trim_newline(&mut username_input);
-            username_input
-        }
-    }
+    username.unwrap_or_else(|| {
+        print!("username: ");
+        let mut username_input = String::new();
+        io::stdout().flush().unwrap();
+        io::stdin().read_line(&mut username_input).unwrap();
+        trim_newline(&mut username_input);
+        username_input
+    })
 }
 
 fn ask_password(password: Option<String>) -> String {
-    match password {
-        Some(p) => p,
-        None => rpassword::prompt_password_stdout("Password: ").unwrap(),
-    }
+    password.unwrap_or_else(|| {
+        rpassword::prompt_password_stdout("Password: ").unwrap()
+    })
 }
 
 enum ClientType {