hatter/buildj
1
0
Fork 0
mirror of https://github.com/jht5945/buildj.git synced 2025-12-27 17:20:06 +08:00
Code Issues Releases Wiki Activity

fix clippy

Browse Source
This commit is contained in:
Hatter Jiang
2020-01-11 00:46:26 +08:00
parent a3a3220307
commit b04d0e3598
5 changed files with 21 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/jdk.rs
View File

@@ -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('/');
@@ -111,9 +111,8 @@ pub fn get_local_java_home(version: &str) -> Option<String> {
Some(i) => path_name = &path_name[i+1..],
};
let mut matched_path = "";
if path_name.starts_with("jdk-") && (&path_name[4..]).starts_with(version) {
matched_path = p;
} else if path_name.starts_with("jdk") && (&path_name[3..]).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;
}
if matched_path != "" {

2
src/local_util.rs
View File

@@ -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 {

15
src/main.rs
View File

@@ -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,7 +138,7 @@ 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() {
cmd.arg(&args[i]);
}
@@ -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];
@@ -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() {
Some(o) => return Some(o),
None => (),
};
if let Some(o) = read_build_json_object_from_env() {
return Some(o);
}
let build_json = match find_build_json() {
None => return None,

10
src/misc.rs
View File

@@ -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
"#, super::BUDERJ_VER, &super::GIT_HASH[0..7]);
Written by Hatter Jiang"#, super::BUDERJ_VER, &super::GIT_HASH[0..7]);
}

14
src/tool.rs
View File

@@ -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") {
dir_name = &file_name[..file_name.len()-4];
} else if file_name.ends_with(".tgz") {
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(".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));