mirror of
https://github.com/jht5945/buildj.git
synced 2025-12-27 17:20:06 +08:00
style: code style
This commit is contained in:
@@ -25,7 +25,7 @@ pub fn download_url(url: &str, dest: &mut File) -> XResult<()> {
|
||||
},
|
||||
};
|
||||
if *VERBOSE {
|
||||
warning!("Content-Length: {}", header_content_length);
|
||||
debugging!("Content-Length: {}", header_content_length);
|
||||
}
|
||||
copy_io(&mut response, dest, header_content_length)?;
|
||||
Ok(())
|
||||
@@ -33,7 +33,7 @@ pub fn download_url(url: &str, dest: &mut File) -> XResult<()> {
|
||||
|
||||
pub fn get_url_content(url: &str) -> XResult<String> {
|
||||
if *VERBOSE {
|
||||
warning!("Get URL: {}", url);
|
||||
debugging!("Get URL: {}", url);
|
||||
}
|
||||
Ok(reqwest::get(url)?.text()?)
|
||||
}
|
||||
|
||||
@@ -15,19 +15,13 @@ use crypto::{
|
||||
};
|
||||
|
||||
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>>()
|
||||
}
|
||||
|
||||
pub fn is_buildin_args(args: &[String]) -> bool {
|
||||
match args.get(1) {
|
||||
None => false,
|
||||
Some(arg) => arg.starts_with(":::") || arg.starts_with("..."),
|
||||
}
|
||||
args.get(1)
|
||||
.map(|arg| arg.starts_with(":::") || arg.starts_with("..."))
|
||||
.unwrap_or(false)
|
||||
}
|
||||
|
||||
pub fn verify_file_integrity(integrity: &str, file_name: &str) -> XResult<bool> {
|
||||
@@ -78,12 +72,12 @@ pub fn calc_file_digest(digest: &mut dyn Digest, digest_alg: &str, file_name: &s
|
||||
}
|
||||
|
||||
pub fn get_user_home() -> XResult<String> {
|
||||
match dirs::home_dir() {
|
||||
None => Err(new_box_ioerror("Home dir not found!")),
|
||||
match dirs::home_dir() {
|
||||
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()),
|
||||
None => Err(new_box_ioerror("Home dir not found!")),
|
||||
},
|
||||
None => Err(new_box_ioerror("Home dir not found!")),
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -351,8 +351,7 @@ fn main() {
|
||||
};
|
||||
|
||||
let (java_home, builder_desc) = match get_java_and_builder(&build_json_object) {
|
||||
None => return,
|
||||
Some((java_home, builder_desc)) => (java_home, builder_desc),
|
||||
Some((java_home, builder_desc)) => (java_home, builder_desc), None => return,
|
||||
};
|
||||
|
||||
success!("JAVA_HOME = {}", java_home);
|
||||
|
||||
Reference in New Issue
Block a user