Rust format

This commit is contained in:
bootandy
2018-05-01 16:16:04 +01:00
parent 8c088a7026
commit 2556885622
3 changed files with 12 additions and 9 deletions
+9 -4
View File
@@ -55,21 +55,26 @@ fn main() {
let number_of_lines = match value_t!(options.value_of("number_of_lines"), usize) {
Ok(v) => v,
Err(_) => { eprintln!("Bad value for number_of_lines - ignoring"); DEFAULT_NUMBER_OF_LINES}
Err(_) => {
eprintln!("Bad value for number_of_lines - ignoring");
DEFAULT_NUMBER_OF_LINES
}
};
let depth = {
if options.is_present("depth") {
match value_t!(options.value_of("depth"), u64) {
Ok(v) => Some(v + 1),
Err(_) => { eprintln!("Bad value for depth - ignoring"); None},
Err(_) => {
eprintln!("Bad value for depth - ignoring");
None
}
}
} else {
None
}
};
if options.is_present("depth") && number_of_lines != DEFAULT_NUMBER_OF_LINES
{
if options.is_present("depth") && number_of_lines != DEFAULT_NUMBER_OF_LINES {
eprintln!("Use either -n or -d. Not both");
return;
}
+2 -2
View File
@@ -1,6 +1,6 @@
use std::cmp::Ordering;
use std::collections::HashMap;
use std::collections::HashSet;
use std::cmp::Ordering;
use walkdir::WalkDir;
@@ -81,7 +81,7 @@ fn examine_dir(
}
}
}
pub fn compare_tuple(a :&(String, u64), b: &(String, u64)) -> Ordering {
pub fn compare_tuple(a: &(String, u64), b: &(String, u64)) -> Ordering {
let result = b.1.cmp(&a.1);
if result == Ordering::Equal {
a.0.cmp(&b.0)
+1 -3
View File
@@ -21,7 +21,5 @@ pub fn get_metadata(d: &DirEntry, use_apparent_size: bool) -> Option<(u64, Optio
#[cfg(not(target_family = "unix"))]
pub fn get_metadata(d: &DirEntry, _apparent: bool) -> Option<(u64, Option<(u64, u64)>)> {
d.metadata().ok().map_or(None, |md| {
Some((md.len(), None))
})
d.metadata().ok().map_or(None, |md| Some((md.len(), None)))
}