mirror/ dutree
1
0
Fork 0
mirror of https://github.com/nachoparker/dutree synced 2024-05-23 01:36:16 +02:00
Code Issues

Remove trailing whitespace

This commit is contained in:
Brian Campbell 2018-12-20 22:18:52 -05:00
parent 970323dcf7
commit fc5f93a72d
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/lib.rs
View File

@ -193,7 +193,7 @@ impl Config {
aggr = 1024u64.pow(2); 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 } ) usage_flag, hiddn_flag, ascii_flag, no_dir_flg, aggr, exclude } )
} }
} }
@ -220,7 +220,7 @@ fn try_read_dir( path : &Path ) -> Option<fs::ReadDir> {
if try_is_symlink( path ) { return None } // don't follow symlinks if try_is_symlink( path ) { return None } // don't follow symlinks
match path.read_dir() { match path.read_dir() {
Ok(dir_list) => Some(dir_list), Ok(dir_list) => Some(dir_list),
Err(err) => { Err(err) => {
print_io_error( path, err ); print_io_error( path, err );
None 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() }, Ok(metadata) => if usage_flag { metadata.st_blocks()*512 } else { metadata.st_size() },
#[cfg(target_os = "macos")] #[cfg(target_os = "macos")]
Ok(metadata) => if usage_flag { metadata.blocks()*512 } else { metadata.size() }, Ok(metadata) => if usage_flag { metadata.blocks()*512 } else { metadata.size() },
Err(err) => { Err(err) => {
print_io_error( path, err ); print_io_error( path, err );
0 0
}, },
@ -287,7 +287,7 @@ impl<'a> Entry<'a> {
} }
vec.sort_unstable_by( |a, b| b.bytes.cmp( &a.bytes ) ); vec.sort_unstable_by( |a, b| b.bytes.cmp( &a.bytes ) );
if aggr_bytes > 0 { if aggr_bytes > 0 {
vec.push( Entry { vec.push( Entry {
name: "<aggregated>".to_string(), name: "<aggregated>".to_string(),
bytes: aggr_bytes, bytes: aggr_bytes,
color: None, color: None,
@ -322,7 +322,7 @@ impl<'a> Entry<'a> {
Entry { name, bytes, color, last: false, entries } Entry { name, bytes, color, last: false, entries }
} }
fn print_entries( &self, open_parents : Vec<bool>, parent_vals : Vec<u64>, fn print_entries( &self, open_parents : Vec<bool>, parent_vals : Vec<u64>,
bytes_flag : bool, ascii_flag : bool, bar_width : usize, tree_name_width : usize ) { bytes_flag : bool, ascii_flag : bool, bar_width : usize, tree_name_width : usize ) {
if let Some(ref entries) = self.entries { if let Some(ref entries) = self.entries {
for entry in entries { for entry in entries {
@ -366,14 +366,14 @@ impl<'a> Entry<'a> {
// draw the tree // draw the tree
for open in &open_parents { for open in &open_parents {
if *open { print!( " " ); } if *open { print!( " " ); }
else { print!( "│ " ); } else { print!( "│ " ); }
} }
if entry.last { print!( "└─ " ); op.push( true ); } if entry.last { print!( "└─ " ); op.push( true ); }
else { print!( "├─ " ); op.push( false ); } else { print!( "├─ " ); op.push( false ); }
// print it // print it
println!( "{} {} {:>13}", println!( "{} {} {:>13}",
name, name,
fmt_bar( &bytes, bar_width, ascii_flag ), fmt_bar( &bytes, bar_width, ascii_flag ),
fmt_size_str( entry.bytes, bytes_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 ) { fn print( &self, bytes_flag : bool, ascii_flag : bool ) {
// calculate plot widths // calculate plot widths
let mut twidth = DEF_WIDTH; let mut twidth = DEF_WIDTH;
let size = terminal_size(); let size = terminal_size();
if let Some( ( Width(w), Height(_h) ) ) = size { if let Some( ( Width(w), Height(_h) ) ) = size {
twidth = w; twidth = w;
@ -567,7 +567,7 @@ pub fn run( cfg: &Config ) {
if len > 0 { if len > 0 {
entries[len-1].last = true; entries[len-1].last = true;
} }
Entry { Entry {
name : "<collection>".to_string(), name : "<collection>".to_string(),
bytes, bytes,
color : None, color : None,

2
src/main.rs
View File

@ -49,7 +49,7 @@ fn main() {
XExit => process::exit(0), XExit => process::exit(0),
XErr(err) => { XErr(err) => {
eprintln!( "{}", err ); eprintln!( "{}", err );
process::exit(1) process::exit(1)
} }
}; };