From 2556885622940621f6167189822feb38569c10fb Mon Sep 17 00:00:00 2001 From: bootandy Date: Tue, 1 May 2018 16:16:04 +0100 Subject: [PATCH] Rust format --- src/main.rs | 13 +++++++++---- src/utils/mod.rs | 4 ++-- src/utils/platform.rs | 4 +--- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/src/main.rs b/src/main.rs index bf8228a..6e664fb 100644 --- a/src/main.rs +++ b/src/main.rs @@ -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; } diff --git a/src/utils/mod.rs b/src/utils/mod.rs index 7f32a0a..36e7d67 100644 --- a/src/utils/mod.rs +++ b/src/utils/mod.rs @@ -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) diff --git a/src/utils/platform.rs b/src/utils/platform.rs index 3d710b0..9945604 100644 --- a/src/utils/platform.rs +++ b/src/utils/platform.rs @@ -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))) }