1
0
mirror of https://github.com/jht5945/buildj.git synced 2025-12-29 10:20:04 +08:00

fix all clippy

This commit is contained in:
2020-01-11 00:55:29 +08:00
parent b04d0e3598
commit 0b52cda6ba
3 changed files with 24 additions and 26 deletions

View File

@@ -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 = ""; let mut java_version = "";

View File

@@ -110,11 +110,12 @@ pub fn get_local_java_home(version: &str) -> Option<String> {
None => (), None => (),
Some(i) => path_name = &path_name[i+1..], 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)) { || (path_name.starts_with("jdk") && (&path_name[3..]).starts_with(version)) {
matched_path = p; p
} } else {
""
};
if matched_path != "" { if matched_path != "" {
if *VERBOSE { if *VERBOSE {
print_message(MessageType::DEBUG, &format!("Matched JDK path found: {}", matched_path)); print_message(MessageType::DEBUG, &format!("Matched JDK path found: {}", matched_path));

View File

@@ -39,10 +39,10 @@ const GIT_HASH: &str = env!("GIT_HASH");
const BUILD_DATE: &str = env!("BUILD_DATE"); 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..]; let ver = &first_arg[7..];
if ver == "" { if ver == "" {
print_message(MessageType::ERROR, &format!("Java version is not assigned!")); print_message(MessageType::ERROR, "Java version is not assigned!");
return; return;
} }
match get_java_home(ver) { 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") 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") 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 { if args.len() <= 2 {
print_message(MessageType::ERROR, "No arguments, get or set."); print_message(MessageType::ERROR, "No arguments, get or set.");
return; return;
@@ -139,15 +139,15 @@ fn do_with_buildin_arg_builder(first_arg: &str, args: &[String], builder_name: &
let mut cmd = Command::new(builder_desc.get_builder_bin()); let mut cmd = Command::new(builder_desc.get_builder_bin());
cmd.envs(&new_env); cmd.envs(&new_env);
let from_index = if has_java { 3 } else { 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| { run_command_and_wait(&mut cmd).unwrap_or_else(|err| {
print_message(MessageType::ERROR, &format!("Run build command failed: {}", 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() { let build_json_object = match read_build_json_object() {
None => return, None => return,
Some(object) => object, 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()); cmd.arg(build_json_object_xrun[i].to_string());
} }
for i in 3..args.len() { for arg in args.iter().skip(3) {
if *VERBOSE { 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 { if *VERBOSE {
print_message(MessageType::DEBUG, &format!("Running cmd: {}, args: {:?}", &cmd_name, cmd_args)); 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(); let first_arg = args.get(1).unwrap();
if first_arg == ":::" || first_arg == ":::help" { if first_arg == ":::" || first_arg == ":::help" {
print_usage(); print_usage();
} else if first_arg == ":::version" { } else if first_arg == ":::version" {
print_version(); print_version();
} else if first_arg == ":::create" { } else if first_arg == ":::create" {
create_build_json(&args); create_build_json(args);
} else if first_arg == ":::config" { } else if first_arg == ":::config" {
do_with_buildin_arg_config(first_arg, args); do_with_buildin_arg_config(first_arg, args);
} else if first_arg.starts_with(":::java") { } else if first_arg.starts_with(":::java") {
@@ -269,8 +269,8 @@ fn get_final_args(args: &[String], build_json_object: &json::JsonValue) -> Optio
} }
} }
if args.len() > 2 { 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) Some(final_args)