From fc5f93a72dadb205fc982220999dc4ccadb164b4 Mon Sep 17 00:00:00 2001 From: Brian Campbell Date: Thu, 20 Dec 2018 22:18:52 -0500 Subject: [PATCH] Remove trailing whitespace --- src/lib.rs | 18 +++++++++--------- src/main.rs | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/lib.rs b/src/lib.rs index 554ae1b..17e3b2b 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -193,7 +193,7 @@ impl Config { aggr = 1024u64.pow(2); } - XOk( Config{ paths, color_dict, depth, depth_flag, bytes_flag, + XOk( Config{ paths, color_dict, depth, depth_flag, bytes_flag, usage_flag, hiddn_flag, ascii_flag, no_dir_flg, aggr, exclude } ) } } @@ -220,7 +220,7 @@ fn try_read_dir( path : &Path ) -> Option { if try_is_symlink( path ) { return None } // don't follow symlinks match path.read_dir() { Ok(dir_list) => Some(dir_list), - Err(err) => { + Err(err) => { print_io_error( path, err ); None }, @@ -234,7 +234,7 @@ fn try_bytes_from_path( path : &Path, usage_flag : bool ) -> u64 { Ok(metadata) => if usage_flag { metadata.st_blocks()*512 } else { metadata.st_size() }, #[cfg(target_os = "macos")] Ok(metadata) => if usage_flag { metadata.blocks()*512 } else { metadata.size() }, - Err(err) => { + Err(err) => { print_io_error( path, err ); 0 }, @@ -287,7 +287,7 @@ impl<'a> Entry<'a> { } vec.sort_unstable_by( |a, b| b.bytes.cmp( &a.bytes ) ); if aggr_bytes > 0 { - vec.push( Entry { + vec.push( Entry { name: "".to_string(), bytes: aggr_bytes, color: None, @@ -322,7 +322,7 @@ impl<'a> Entry<'a> { Entry { name, bytes, color, last: false, entries } } - fn print_entries( &self, open_parents : Vec, parent_vals : Vec, + fn print_entries( &self, open_parents : Vec, parent_vals : Vec, bytes_flag : bool, ascii_flag : bool, bar_width : usize, tree_name_width : usize ) { if let Some(ref entries) = self.entries { for entry in entries { @@ -366,14 +366,14 @@ impl<'a> Entry<'a> { // draw the tree for open in &open_parents { - if *open { print!( " " ); } + if *open { print!( " " ); } else { print!( "│ " ); } } if entry.last { print!( "└─ " ); op.push( true ); } else { print!( "├─ " ); op.push( false ); } // print it - println!( "{} {} {:>13}", + println!( "{} {} {:>13}", name, fmt_bar( &bytes, bar_width, ascii_flag ), fmt_size_str( entry.bytes, bytes_flag ) ); @@ -389,7 +389,7 @@ impl<'a> Entry<'a> { fn print( &self, bytes_flag : bool, ascii_flag : bool ) { // calculate plot widths - let mut twidth = DEF_WIDTH; + let mut twidth = DEF_WIDTH; let size = terminal_size(); if let Some( ( Width(w), Height(_h) ) ) = size { twidth = w; @@ -567,7 +567,7 @@ pub fn run( cfg: &Config ) { if len > 0 { entries[len-1].last = true; } - Entry { + Entry { name : "".to_string(), bytes, color : None, diff --git a/src/main.rs b/src/main.rs index c6ef49a..613a9da 100644 --- a/src/main.rs +++ b/src/main.rs @@ -49,7 +49,7 @@ fn main() { XExit => process::exit(0), XErr(err) => { eprintln!( "{}", err ); - process::exit(1) + process::exit(1) } };