hatter/rust_util
1
0
Fork 0
mirror of https://github.com/jht5945/rust_util.git synced 2025-12-27 15:40:03 +08:00
Code Issues Releases Wiki Activity

fix clippy

Browse Source
This commit is contained in:
Hatter Jiang
2020-01-11 11:51:28 +08:00
parent c4c6273c38
commit 5074a46c61
3 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/util_file.rs
View File

@@ -12,9 +12,10 @@ use super::{
};
pub fn get_home_str() -> Option<String> {
match util_os::is_macos_or_linux() {
true => env::var("HOME").ok(),
false => None,
if util_os::is_macos_or_linux() {
env::var("HOME").ok()
} else {
None
}
}
@@ -84,7 +85,6 @@ fn walk_dir_with_depth_check<FError, FProcess, FFilter>(depth: &mut u32, dir: &P
match walk_dir_with_depth_check(depth, &sub_dir, func_walk_error, func_process_file, func_filter_dir) {
Err(err) => {
func_walk_error(&sub_dir, err);
()
},
Ok(_) => (),
}

4
src/util_msg.rs
View File

@@ -9,8 +9,8 @@ lazy_static! {
pub enum MessageType { INFO, OK, WARN, ERROR, DEBUG, }
pub fn is_atty() -> bool{
let isatty = unsafe { libc::isatty(libc::STDOUT_FILENO as i32) } != 0;
isatty
let stdout_fileno = unsafe { libc::isatty(libc::STDOUT_FILENO as i32) };
stdout_fileno != 0
}
pub fn print_color(color: Option<term::color::Color>, is_bold: bool, m: &str) {

24
src/util_size.rs
View File

@@ -9,20 +9,20 @@ pub const SIZE_TB: i64 = SIZE_PB * SIZE_KB;
pub fn parse_size(size: &str) -> XResult<i64> {
let lower_size = size.to_lowercase();
let no_last_b_size = if lower_size.ends_with("b") {
let no_last_b_size = if lower_size.ends_with('b') {
&lower_size[0..lower_size.len()-1]
} else {
&lower_size
};
if no_last_b_size.ends_with("k") {
if no_last_b_size.ends_with('k') {
return Ok((SIZE_KB as f64 * no_last_b_size[0..no_last_b_size.len()-1].parse::<f64>()?) as i64);
} else if no_last_b_size.ends_with("m") {
} else if no_last_b_size.ends_with('m') {
return Ok((SIZE_MB as f64 * no_last_b_size[0..no_last_b_size.len()-1].parse::<f64>()?) as i64);
} else if no_last_b_size.ends_with("g") {
} else if no_last_b_size.ends_with('g') {
return Ok((SIZE_GB as f64 * no_last_b_size[0..no_last_b_size.len()-1].parse::<f64>()?) as i64);
} else if no_last_b_size.ends_with("t") {
} else if no_last_b_size.ends_with('t') {
return Ok((SIZE_TB as f64 * no_last_b_size[0..no_last_b_size.len()-1].parse::<f64>()?) as i64);
} else if no_last_b_size.ends_with("p") {
} else if no_last_b_size.ends_with('p') {
return Ok((SIZE_PB as f64 * no_last_b_size[0..no_last_b_size.len()-1].parse::<f64>()?) as i64);
}
@@ -31,16 +31,16 @@ pub fn parse_size(size: &str) -> XResult<i64> {
pub fn get_display_size(size: i64) -> String {
if size < SIZE_KB {
return size.to_string();
size.to_string()
} else if size < SIZE_MB {
return format!("{:.*}KB", 2, (size as f64) / 1024.);
format!("{:.*}KB", 2, (size as f64) / 1024.)
} else if size < SIZE_GB {
return format!("{:.*}MB", 2, (size as f64) / 1024. / 1024.);
format!("{:.*}MB", 2, (size as f64) / 1024. / 1024.)
} else if size < SIZE_TB {
return format!("{:.*}GB", 2, (size as f64) / 1024. / 1024. / 1024.);
format!("{:.*}GB", 2, (size as f64) / 1024. / 1024. / 1024.)
} else if size < SIZE_PB {
return format!("{:.*}TB", 2, (size as f64) / 1024. / 1024. / 1024. / 1024.);
format!("{:.*}TB", 2, (size as f64) / 1024. / 1024. / 1024. / 1024.)
} else {
return format!("{:.*}PB", 2, (size as f64) / 1024. / 1024. / 1024. / 1024. / 1024.);
format!("{:.*}PB", 2, (size as f64) / 1024. / 1024. / 1024. / 1024. / 1024.)
}
}