style: code style

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()?)
 }

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) {
+    args.get(1)
-        None => false,
+        .map(|arg| arg.starts_with(":::") || arg.starts_with("..."))
-        Some(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() {
+    match dirs::home_dir() {
-        None => Err(new_box_ioerror("Home dir not found!")),
         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!")),
     }
 }
 

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), None => return,
-        Some((java_home, builder_desc)) => (java_home, builder_desc),
     };
    
     success!("JAVA_HOME    = {}", java_home);

src/misc.rs

@@ -11,28 +11,7 @@ lazy_static! {
 }
 
 pub fn print_usage() {
-    println!(r#"
+    println!("\n{}", include_str!("usage.txt"));
-buildj :::                                          - print this message
-buildj :::help                                      - print this message
-buildj :::version                                   - print version
-buildj :::config get|set <secret>                   - get/set config
-buildj :::create --java<version> --maven<version>   - create java + maven project
-  e.g. buildj :::create --java1.8 --maven3.5.2
-buildj :::create --java<version> --gradle<version>  - create java + gradle project
-  e.g. buildj :::create --java1.8 --gradle3.5.1
-buildj :::java<version> [-version]                  - run java with assigned version
-  e.g. buildj :::java1.8 -version
-buildj :::maven<version> [--java<version>]          - run maven with assigned version and java version
-  e.g. buildj :::maven3.5.2 --java1.8 ARGS
-buildj :::gradle<version> [--java<version>]         - run gradle with assigned version and java version
-  e.g. buildj :::gradle3.5.1 --java1.8 ARGS
-buildj                                              - run build, run assigned version builder tool
-BUILDJ_NOBUILDIN=1 buildj                           - ignore buildj buildin commands
-BUILDJ_VERBOSE=1 buildj                             - run buildj in verbose mode
-BUILDJ_NOAUTH=1 buildj                              - run buildj in no auth mode
-BUILDJ_JAVA_NAME=jdk-name buildj                    - assgin java name, e.g. adoptjdk-linux
-BUILDJ_AUTH_TOKEN=auth-token buildj                 - assign auth token
-BUILDJ_JAVA=1.8 BUILDJ_BUILDER=maven3.5.2 buildj    - direct run buildj"#);
 }
 
 pub fn print_version() {

src/usage.txt

@@ -0,0 +1,21 @@
+buildj :::                                          - print this message
+buildj :::help                                      - print this message
+buildj :::version                                   - print version
+buildj :::config get|set <secret>                   - get/set config
+buildj :::create --java<version> --maven<version>   - create java + maven project
+  e.g. buildj :::create --java1.8 --maven3.5.2
+buildj :::create --java<version> --gradle<version>  - create java + gradle project
+  e.g. buildj :::create --java1.8 --gradle3.5.1
+buildj :::java<version> [-version]                  - run java with assigned version
+  e.g. buildj :::java1.8 -version
+buildj :::maven<version> [--java<version>]          - run maven with assigned version and java version
+  e.g. buildj :::maven3.5.2 --java1.8 ARGS
+buildj :::gradle<version> [--java<version>]         - run gradle with assigned version and java version
+  e.g. buildj :::gradle3.5.1 --java1.8 ARGS
+buildj                                              - run build, run assigned version builder tool
+BUILDJ_NOBUILDIN=1 buildj                           - ignore buildj buildin commands
+BUILDJ_VERBOSE=1 buildj                             - run buildj in verbose mode
+BUILDJ_NOAUTH=1 buildj                              - run buildj in no auth mode
+BUILDJ_JAVA_NAME=jdk-name buildj                    - assgin java name, e.g. adoptjdk-linux
+BUILDJ_AUTH_TOKEN=auth-token buildj                 - assign auth token
+BUILDJ_JAVA=1.8 BUILDJ_BUILDER=maven3.5.2 buildj    - direct run buildj