From 7ee4ef2b571266812f1d1bf72bddb18fbd7415cf Mon Sep 17 00:00:00 2001
From: "Hatter Jiang@Pixelbook" <jht5945@gmail.com>
Date: Sun, 2 Aug 2020 19:10:01 +0800
Subject: [PATCH] style: code style

---
 src/http.rs       |  4 ++--
 src/local_util.rs | 18 ++++++------------
 src/main.rs       |  3 +--
 3 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/src/http.rs b/src/http.rs
index fdeece7..a63ef2d 100644
--- a/src/http.rs
+++ b/src/http.rs
@@ -25,7 +25,7 @@ pub fn download_url(url: &str, dest: &mut File) -> XResult<()> {
         },
     };
     if *VERBOSE {
-        warning!("Content-Length: {}", header_content_length);
+        debugging!("Content-Length: {}", header_content_length);
     }
     copy_io(&mut response, dest, header_content_length)?;
     Ok(())
@@ -33,7 +33,7 @@ pub fn download_url(url: &str, dest: &mut File) -> XResult<()> {
 
 pub fn get_url_content(url: &str) -> XResult<String> {
     if *VERBOSE {
-        warning!("Get URL: {}", url);
+        debugging!("Get URL: {}", url);
     }
     Ok(reqwest::get(url)?.text()?)
 }
diff --git a/src/local_util.rs b/src/local_util.rs
index c53aad8..559e173 100644
--- a/src/local_util.rs
+++ b/src/local_util.rs
@@ -15,19 +15,13 @@ use crypto::{
 };
 
 pub fn get_args_as_vec() -> Vec<String> {
-    // let mut args_vec:Vec<String> = vec![];
-    // for arg in env::args() {
-    //     args_vec.push(arg);
-    // }
-    // args_vec
     env::args().collect::<Vec<String>>()
 }
 
 pub fn is_buildin_args(args: &[String]) -> bool {
-    match args.get(1) {
-        None => false,
-        Some(arg) => arg.starts_with(":::") || arg.starts_with("..."),
-    }
+    args.get(1)
+        .map(|arg| arg.starts_with(":::") || arg.starts_with("..."))
+        .unwrap_or(false)
 }
 
 pub fn verify_file_integrity(integrity: &str, file_name: &str) -> XResult<bool> {
@@ -78,12 +72,12 @@ pub fn calc_file_digest(digest: &mut dyn Digest, digest_alg: &str, file_name: &s
 }
 
 pub fn get_user_home() -> XResult<String> {
-   match dirs::home_dir() {
-        None => Err(new_box_ioerror("Home dir not found!")),
+    match dirs::home_dir() {
         Some(home_dir_o) => match home_dir_o.to_str() {
-            None => Err(new_box_ioerror("Home dir not found!")),
             Some(home_dir_str) => Ok(home_dir_str.to_string()),
+            None => Err(new_box_ioerror("Home dir not found!")),
         },
+        None => Err(new_box_ioerror("Home dir not found!")),
     }
 }
 
diff --git a/src/main.rs b/src/main.rs
index b037666..338906c 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -351,8 +351,7 @@ fn main() {
     };
 
     let (java_home, builder_desc) = match get_java_and_builder(&build_json_object) {
-        None => return,
-        Some((java_home, builder_desc)) => (java_home, builder_desc),
+        Some((java_home, builder_desc)) => (java_home, builder_desc), None => return,
     };
    
     success!("JAVA_HOME    = {}", java_home);