fix all clippy

src/build_json.rs

@@ -40,13 +40,10 @@ pub fn get_archive_version(gid: &str, aid: &str) -> XResult<String> {
     }
 }
 
-pub fn create_build_json(args: &Vec<String>) {
+pub fn create_build_json(args: &[String]) {
-    match find_build_json_in_current() {
+    if find_build_json_in_current().is_some() {
-        Some(_) => {
+        print_message(MessageType::ERROR, &format!("File exits: {}", BUILD_JSON));
-            print_message(MessageType::ERROR, &format!("File exits: {}", BUILD_JSON));
+        return;
-            return;
-        }, 
-        None => (), // OK
     }
 
     let mut java_version = "";

src/jdk.rs

@@ -102,7 +102,7 @@ pub fn get_local_java_home(version: &str) -> Option<String> {
                         print_message(MessageType::DEBUG, &format!("Try match path: {}", p));
                     }
                     let mut path_name = p;
-                    if p.ends_with("/") {
+                    if p.ends_with('/') {
                         path_name = &path_name[..path_name.len() - 1]
                     }
                     let last_index_of_slash = path_name.rfind('/');
@@ -110,12 +110,12 @@ pub fn get_local_java_home(version: &str) -> Option<String> {
                         None => (),
                         Some(i) => path_name = &path_name[i+1..],
                     };
-                    let mut matched_path = "";
+                    let matched_path = if (path_name.starts_with("jdk-") && (&path_name[4..]).starts_with(version))
-                    if path_name.starts_with("jdk-") && (&path_name[4..]).starts_with(version) {
+                        || (path_name.starts_with("jdk") && (&path_name[3..]).starts_with(version)) {
-                        matched_path = p;
+                        p
-                    } else if path_name.starts_with("jdk") && (&path_name[3..]).starts_with(version) {
+                    } else {
-                        matched_path = p;
+                        ""
-                    }
+                    };
                     if matched_path != "" {
                         if *VERBOSE {
                             print_message(MessageType::DEBUG, &format!("Matched JDK path found: {}", matched_path));

src/local_util.rs

@@ -32,7 +32,7 @@ pub fn get_args_as_vec() -> Vec<String> {
     args_vec
 }
 
-pub fn is_buildin_args(args: &Vec<String>) -> bool {
+pub fn is_buildin_args(args: &[String]) -> bool {
     if args.len() <= 1 {
         false
     } else {

src/main.rs

@@ -39,10 +39,10 @@ const GIT_HASH: &str = env!("GIT_HASH");
 const BUILD_DATE: &str = env!("BUILD_DATE");
 
 
-fn do_with_buildin_arg_java(first_arg: &str, args: &Vec<String>) {
+fn do_with_buildin_arg_java(first_arg: &str, args: &[String]) {
     let ver = &first_arg[7..];
     if ver == "" {
-        print_message(MessageType::ERROR, &format!("Java version is not assigned!"));
+        print_message(MessageType::ERROR, "Java version is not assigned!");
         return;
     }
     match get_java_home(ver) {
@@ -62,15 +62,15 @@ fn do_with_buildin_arg_java(first_arg: &str, args: &Vec<String>) {
     };
 }
 
-fn do_with_buildin_arg_maven(first_arg: &str, args: &Vec<String>) {
+fn do_with_buildin_arg_maven(first_arg: &str, args: &[String]) {
     do_with_buildin_arg_builder(first_arg, args, "maven")
 }
 
-fn do_with_buildin_arg_gradle(first_arg: &str, args: &Vec<String>) {
+fn do_with_buildin_arg_gradle(first_arg: &str, args: &[String]) {
     do_with_buildin_arg_builder(first_arg, args, "gradle")
 }
 
-fn do_with_buildin_arg_config(_first_arg: &str, args: &Vec<String>) {
+fn do_with_buildin_arg_config(_first_arg: &str, args: &[String]) {
     if args.len() <= 2 {
         print_message(MessageType::ERROR, "No arguments, get or set.");
         return;
@@ -94,10 +94,10 @@ fn do_with_buildin_arg_config(_first_arg: &str, args: &Vec<String>) {
     }
 }
 
-fn do_with_buildin_arg_builder(first_arg: &str, args: &Vec<String>, builder_name: &str) {
+fn do_with_buildin_arg_builder(first_arg: &str, args: &[String], builder_name: &str) {
     let builder_version = &first_arg[(builder_name.len() + 3)..];
     if builder_version == "" {
-        print_message(MessageType::ERROR, &format!("Builder version is not assigned!"));
+        print_message(MessageType::ERROR, "Builder version is not assigned!");
         return;
     }
     let mut has_java = false;
@@ -138,16 +138,16 @@ fn do_with_buildin_arg_builder(first_arg: &str, args: &Vec<String>, builder_name
 
     let mut cmd = Command::new(builder_desc.get_builder_bin());
     cmd.envs(&new_env);
-    let from_index = match has_java { true => 3, false => 2 };
+    let from_index = if has_java { 3 } else { 2 };
-    for i in from_index..args.len() {
+    for arg in args.iter().skip(from_index) {
-        cmd.arg(&args[i]);
+        cmd.arg(&arg);
     }
     run_command_and_wait(&mut cmd).unwrap_or_else(|err| {
         print_message(MessageType::ERROR, &format!("Run build command failed: {}", err));
     });
 }
 
-fn do_with_buildin_arg_ddd(first_arg: &str, args: &Vec<String>) {
+fn do_with_buildin_arg_ddd(first_arg: &str, args: &[String]) {
     let build_json_object = match read_build_json_object() {
         None => return,
         Some(object) => object,
@@ -167,11 +167,11 @@ fn do_with_buildin_arg_ddd(first_arg: &str, args: &Vec<String>) {
         }
         cmd.arg(build_json_object_xrun[i].to_string());
     }
-    for i in 3..args.len() {
+    for arg in args.iter().skip(3) {
         if *VERBOSE {
-            cmd_args.push(args[i].to_string());
+            cmd_args.push(arg.to_string());
         }
-        cmd.arg(args[i].to_string());
+        cmd.arg(arg.to_string());
     }
     if *VERBOSE {
         print_message(MessageType::DEBUG, &format!("Running cmd: {}, args: {:?}", &cmd_name, cmd_args));
@@ -181,14 +181,14 @@ fn do_with_buildin_arg_ddd(first_arg: &str, args: &Vec<String>) {
     });
 }
 
-fn do_with_buildin_args(args: &Vec<String>) {
+fn do_with_buildin_args(args: &[String]) {
      let first_arg = args.get(1).unwrap();
     if first_arg == ":::" || first_arg == ":::help" {
         print_usage();
     } else if first_arg == ":::version" {
         print_version();
     } else if first_arg == ":::create" {
-        create_build_json(&args);
+        create_build_json(args);
     } else if first_arg == ":::config" {
         do_with_buildin_arg_config(first_arg, args);
     } else if first_arg.starts_with(":::java") {
@@ -243,7 +243,7 @@ fn get_java_and_builder(build_json_object: &json::JsonValue) -> Option<(String,
     Some((java_home, builder_desc))
 }
 
-fn get_final_args(args: &Vec<String>, build_json_object: &json::JsonValue) -> Option<Vec<String>> {
+fn get_final_args(args: &[String], build_json_object: &json::JsonValue) -> Option<Vec<String>> {
     let mut final_args:Vec<String> = vec![];
     if args.len() > 1 {
         let arg1 = &args[1];
@@ -269,8 +269,8 @@ fn get_final_args(args: &Vec<String>, build_json_object: &json::JsonValue) -> Op
         }
     }
     if args.len() > 2 {
-        for i in 2..args.len() {
+        for arg in args.iter().skip(2) {
-            final_args.push(args[i].to_string());
+            final_args.push(arg.to_string());
         }
     }
     Some(final_args)
@@ -326,10 +326,9 @@ fn read_build_json_object_from_env() -> Option<json::JsonValue> {
 }
 
 fn read_build_json_object() -> Option<json::JsonValue> {
-    match read_build_json_object_from_env() {
+    if let Some(o) = read_build_json_object_from_env() {
-        Some(o) => return Some(o),
+        return Some(o);
-        None => (),
+    }
-    };
 
     let build_json = match find_build_json() {
         None => return None,

src/misc.rs

@@ -12,7 +12,7 @@ lazy_static! {
 }
 
 pub fn print_usage() {
-    print!(r#"
+    println!(r#"
 buildj :::                                          - print this message
 buildj :::help                                      - print this message
 buildj :::version                                   - print version
@@ -33,16 +33,14 @@ 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
+BUILDJ_JAVA=1.8 BUILDJ_BUILDER=maven3.5.2 buildj    - direct run buildj"#);
-"#);
 }
 
 pub fn print_version() {
-  print!(r#"buildj {} - {}
+  println!(r#"buildj {} - {}
 Copyright (C) 2019 Hatter Jiang.
 License MIT <https://opensource.org/licenses/MIT>
 
-Written by Hatter Jiang
+Written by Hatter Jiang"#, super::BUDERJ_VER, &super::GIT_HASH[0..7]);
-"#, super::BUDERJ_VER, &super::GIT_HASH[0..7]);
 }
 

src/tool.rs

@@ -93,7 +93,7 @@ pub fn get_cloud_builder(builder: &str, version: &str) -> bool {
     match get_and_extract_tool_package(&local_builder_home_base_dir, true, builder, version, true) {
         Err(err) => {
             print_message(MessageType::ERROR, &format!("Get builder: {} failed, version: {}, error: {}", builder, version, err));
-            return false;
+            false
         },
         Ok(_) => true,
     }
@@ -103,10 +103,10 @@ pub fn get_local_builder_home_sub(builder_name: BuilderName, local_builder_home_
     match get_local_builder_home_sub_first_sub_dir(local_builder_home_dir) {
         None => {
             print_message(MessageType::ERROR, &format!("Cannot find builder home in: {}", local_builder_home_dir));
-            return None;
+            None
         },
         Some(p) => {
-            return Some(BuilderDesc{name: builder_name, home: p, bin: None});
+            Some(BuilderDesc{name: builder_name, home: p, bin: None})
         },
     }
 }
@@ -131,9 +131,7 @@ pub fn get_extract_dir_name_by_file_name(file_name: &str) -> Option<String> {
         return None;
     }
     let mut dir_name = file_name;
-    if file_name.ends_with(".zip") {
+    if file_name.ends_with(".zip") || file_name.ends_with(".tgz") {
-        dir_name = &file_name[..file_name.len()-4];
-    } else if file_name.ends_with(".tgz") {
         dir_name = &file_name[..file_name.len()-4];
     } else if file_name.ends_with(".tar.gz") {
         dir_name = &file_name[..file_name.len()-7];
@@ -252,7 +250,7 @@ pub fn get_and_extract_tool_package(base_dir: &str, dir_with_name: bool, name: &
     let n = data["n"].to_string();
     let v = data["v"].to_string();
 
-    if extract_match &&  version != &v {
+    if extract_match &&  version != v {
         return Err(new_box_ioerror(&format!("Required version not match, {}: {} vs {}", name, version, &v)));
     }
 
@@ -272,7 +270,7 @@ pub fn get_and_extract_tool_package(base_dir: &str, dir_with_name: bool, name: &
     if local_util::verify_file_integrity(&integrity.to_string(), &target_file_name)? {
         print_message(MessageType::OK, "Verify integrity success.");
     } else {
-        return Err(new_box_ioerror(&format!("Verify integrity failed!")));
+        return Err(new_box_ioerror("Verify integrity failed!"));
     }
 
     print_message(MessageType::INFO, &format!("Start extract file: {}", &target_file_name));