File tree Expand file tree Collapse file tree 2 files changed +10
-15
lines changed Expand file tree Collapse file tree 2 files changed +10
-15
lines changed Original file line number Diff line number Diff line change @@ -30,8 +30,7 @@ unicode-width = "0.1"
30
30
ignore =" 0.4"
31
31
crossbeam-channel = " 0.4"
32
32
walkdir =" 2.3"
33
- # todo use num_format instead
34
- thousands =" "
33
+ thousands = " 0.2"
35
34
36
35
[target .'cfg(windows)' .dependencies ]
37
36
winapi-util = " 0.1"
Original file line number Diff line number Diff line change @@ -338,26 +338,22 @@ fn get_name_percent(
338
338
}
339
339
340
340
fn get_pretty_size ( node : & Node , is_biggest : bool , display_data : & DisplayData ) -> String {
341
- if display_data. by_filecount {
341
+ let output = if display_data. by_filecount {
342
342
let size_as_str = node. size . separate_with_commas ( ) ;
343
343
let spaces_to_add =
344
344
display_data. num_chars_needed_on_left_most - size_as_str. chars ( ) . count ( ) ;
345
- let first_size_bar = size_as_str + & * repeat ( ' ' ) . take ( spaces_to_add) . collect :: < String > ( ) ;
345
+ size_as_str + & * repeat ( ' ' ) . take ( spaces_to_add) . collect :: < String > ( )
346
+ } else {
347
+ format ! ( "{:>5}" , human_readable_number( node. size) )
348
+ } ;
346
349
347
- if is_biggest && display_data. colors_on {
348
- format ! ( "{}" , Red . paint( first_size_bar) )
349
- } else {
350
- first_size_bar
351
- }
350
+ if is_biggest && display_data. colors_on {
351
+ format ! ( "{}" , Red . paint( output) )
352
352
} else {
353
- let pretty_size = format ! ( "{:>5}" , human_readable_number( node. size) ) ;
354
- if is_biggest && display_data. colors_on {
355
- format ! ( "{}" , Red . paint( pretty_size) )
356
- } else {
357
- pretty_size
358
- }
353
+ output
359
354
}
360
355
}
356
+
361
357
fn get_pretty_name ( node : & Node , name_and_padding : String , display_data : & DisplayData ) -> String {
362
358
if display_data. colors_on {
363
359
let meta_result = fs:: metadata ( node. name . clone ( ) ) ;
You can’t perform that action at this time.
0 commit comments