From 322c2b4df6266ba6bfc4fce7213791c9ee9b130a Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sat, 16 Mar 2024 10:24:55 +0100 Subject: [PATCH] shred: simplify the code The formatting directive {:2.0} will handle both cases (single-digit and double-digit numbers) by ensuring at least two characters wide with no decimal places --- src/uu/shred/src/shred.rs | 24 +++++++----------------- 1 file changed, 7 insertions(+), 17 deletions(-) diff --git a/src/uu/shred/src/shred.rs b/src/uu/shred/src/shred.rs index b142e2e94..bb938c73d 100644 --- a/src/uu/shred/src/shred.rs +++ b/src/uu/shred/src/shred.rs @@ -477,23 +477,13 @@ fn wipe_file( for (i, pass_type) in pass_sequence.into_iter().enumerate() { if verbose { let pass_name = pass_name(&pass_type); - if total_passes < 10 { - show_error!( - "{}: pass {}/{} ({})...", - path.maybe_quote(), - i + 1, - total_passes, - pass_name - ); - } else { - show_error!( - "{}: pass {:2.0}/{:2.0} ({})...", - path.maybe_quote(), - i + 1, - total_passes, - pass_name - ); - } + show_error!( + "{}: pass {:2}/{} ({})...", + path.maybe_quote(), + i + 1, + total_passes, + pass_name + ); } // size is an optional argument for exactly how many bytes we want to shred // Ignore failed writes; just keep trying