hatter/buildj
1
0
Fork 0
mirror of https://github.com/jht5945/buildj.git synced 2025-12-29 18:30:05 +08:00
Code Issues Releases Wiki Activity

style: code style

Browse Source
This commit is contained in:
Hatter Jiang
2020-08-02 19:10:01 +08:00
parent 84adb46365
commit 7ee4ef2b57
3 changed files with 9 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/http.rs
View File

@@ -25,7 +25,7 @@ pub fn download_url(url: &str, dest: &mut File) -> XResult<()> {
}, },
}; };
if *VERBOSE { if *VERBOSE {
warning!("Content-Length: {}", header_content_length); debugging!("Content-Length: {}", header_content_length);
} }
copy_io(&mut response, dest, header_content_length)?; copy_io(&mut response, dest, header_content_length)?;
Ok(()) Ok(())
@@ -33,7 +33,7 @@ pub fn download_url(url: &str, dest: &mut File) -> XResult<()> {
pub fn get_url_content(url: &str) -> XResult<String> { pub fn get_url_content(url: &str) -> XResult<String> {
if *VERBOSE { if *VERBOSE {
warning!("Get URL: {}", url); debugging!("Get URL: {}", url);
} }
Ok(reqwest::get(url)?.text()?) Ok(reqwest::get(url)?.text()?)
} }

16
src/local_util.rs
View File

@@ -15,19 +15,13 @@ use crypto::{
}; };
pub fn get_args_as_vec() -> Vec<String> { 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>>() env::args().collect::<Vec<String>>()
} }
pub fn is_buildin_args(args: &[String]) -> bool { 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> { pub fn verify_file_integrity(integrity: &str, file_name: &str) -> XResult<bool> {
@@ -79,11 +73,11 @@ pub fn calc_file_digest(digest: &mut dyn Digest, digest_alg: &str, file_name: &s
pub fn get_user_home() -> XResult<String> { 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() { 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()), 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!")),
} }
} }

3
src/main.rs
View File

@@ -351,8 +351,7 @@ fn main() {
}; };
let (java_home, builder_desc) = match get_java_and_builder(&build_json_object) { 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); success!("JAVA_HOME = {}", java_home);