1
0
mirror of https://github.com/jht5945/buildj.git synced 2025-12-28 09:40:04 +08:00

rm unused fn

This commit is contained in:
2020-02-03 00:38:09 +08:00
parent 0b52cda6ba
commit c1fb92449e
6 changed files with 9 additions and 25 deletions

View File

@@ -102,10 +102,10 @@ pub fn find_build_json_in_current() -> Option<String> {
pub fn find_build_json_in_parents() -> Option<String> {
let mut path = fs::canonicalize(".").ok()?;
let mut loop_count = 0usize;
let mut loop_count = 0_usize;
loop {
loop_count += 1usize;
if loop_count > 100usize {
loop_count += 1_usize;
if loop_count > 100_usize {
print_message(MessageType::ERROR, "Find build.json loop more than 100 loop!");
return None;
}

View File

@@ -19,7 +19,7 @@ pub fn download_url(url: &str, dest: &mut File) -> XResult<()> {
}
let mut response = reqwest::get(url)?;
let header_content_length: i64 = match response.headers().get("content-length") {
None => -1,
None => -1_i64,
Some(len_value) => len_value.to_str().unwrap().parse::<i64>().unwrap(),
};
if *VERBOSE {

View File

@@ -116,7 +116,7 @@ pub fn get_local_java_home(version: &str) -> Option<String> {
} else {
""
};
if matched_path != "" {
if !matched_path.is_empty() {
if *VERBOSE {
print_message(MessageType::DEBUG, &format!("Matched JDK path found: {}", matched_path));
}

View File

@@ -72,11 +72,11 @@ pub fn calc_file_digest(digest: &mut dyn Digest, digest_alg: &str, file_name: &s
let mut buf: [u8; DEFAULT_BUF_SIZE] = [0u8; DEFAULT_BUF_SIZE];
let mut f = File::open(file_name)?;
let file_len = match f.metadata() {
Err(_) => -1i64,
Err(_) => -1_i64,
Ok(meta_data) => meta_data.len() as i64,
};
let start = SystemTime::now();
let mut written = 0i64;
let mut written = 0_i64;
loop {
let len = match f.read(&mut buf) {
Ok(0) => { println!(); return Ok(digest.result_str()); },

View File

@@ -96,7 +96,7 @@ fn do_with_buildin_arg_config(_first_arg: &str, args: &[String]) {
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 == "" {
if builder_version.is_empty() {
print_message(MessageType::ERROR, "Builder version is not assigned!");
return;
}
@@ -105,7 +105,7 @@ fn do_with_buildin_arg_builder(first_arg: &str, args: &[String], builder_name: &
if args.len() > 2 && args[2].starts_with("--java") {
has_java = true;
let java_version = &args[2][6..];
if java_version != "" {
if !java_version.is_empty() {
java_home = match get_java_home(java_version) {
None => {
print_message(MessageType::ERROR, &format!("Assigned java version not found: {}", java_version));

View File

@@ -126,22 +126,6 @@ pub fn get_local_builder_home_sub_first_sub_dir(local_builder_home_dir: &str) ->
None
}
pub fn get_extract_dir_name_by_file_name(file_name: &str) -> Option<String> {
if file_name != "" {
return None;
}
let mut dir_name = file_name;
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];
}
if dir_name.ends_with("-bin") {
dir_name = &dir_name[..dir_name.len()-4];
}
Some(dir_name.to_string())
}
pub fn get_tool_package_secret() -> XResult<String> {
if (*AUTH_TOKEN).is_some() {
if *VERBOSE {