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

fix clippy

Browse Source
This commit is contained in:
Hatter Jiang
2020-01-11 11:57:43 +08:00
parent 5074a46c61
commit 53747a2337
3 changed files with 16 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/util_file.rs
View File

@@ -82,11 +82,8 @@ fn walk_dir_with_depth_check<FError, FProcess, FFilter>(depth: &mut u32, dir: &P
} else if sub_dir.is_dir() { } else if sub_dir.is_dir() {
if func_filter_dir(&sub_dir) { if func_filter_dir(&sub_dir) {
*depth += 1; *depth += 1;
match walk_dir_with_depth_check(depth, &sub_dir, func_walk_error, func_process_file, func_filter_dir) { if let Err(err) = 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); func_walk_error(&sub_dir, err);
},
Ok(_) => (),
} }
*depth -= 1; *depth -= 1;
} }

14
src/util_msg.rs
View File

@@ -15,20 +15,18 @@ pub fn is_atty() -> bool{
pub fn print_color(color: Option<term::color::Color>, is_bold: bool, m: &str) { pub fn print_color(color: Option<term::color::Color>, is_bold: bool, m: &str) {
let mut t = term::stdout().unwrap(); let mut t = term::stdout().unwrap();
match *IS_ATTY { if *IS_ATTY {
true => { if let Some(c) = color {
match color { t.fg(c).unwrap();
Some(c) => t.fg(c).unwrap(),
None => (),
} }
if is_bold { if is_bold {
t.attr(term::Attr::Bold).unwrap(); t.attr(term::Attr::Bold).unwrap();
} }
write!(t, "{}", m).unwrap(); write!(t, "{}", m).unwrap();
t.reset().unwrap(); t.reset().unwrap();
}, } else {
false => write!(t, "{}", m).unwrap(), write!(t, "{}", m).unwrap();
}; }
} }
pub fn print_color_and_flush(color: Option<term::color::Color>, is_bold: bool, m: &str) { pub fn print_color_and_flush(color: Option<term::color::Color>, is_bold: bool, m: &str) {

12
src/util_os.rs
View File

@@ -1,18 +1,10 @@
pub fn is_macos() -> bool { pub fn is_macos() -> bool {
if cfg!(target_os = "macos") { cfg!(target_os = "macos")
true
} else {
false
}
} }
pub fn is_linux() -> bool { pub fn is_linux() -> bool {
if cfg!(target_os = "linux") { cfg!(target_os = "linux")
true
} else {
false
}
} }
pub fn is_macos_or_linux() -> bool { pub fn is_macos_or_linux() -> bool {