df: fix formatting, add test case and fix linting

Author: STRTSNM

src/uu/df/src/blocks.rs

@@ -191,7 +191,6 @@ pub(crate) fn read_block_size(matches: &ArgMatches) -> Result<BlockSize, ParseSi
     }
 }
 
-
 impl fmt::Display for BlockSize {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         match self {

src/uu/df/src/table.rs

@@ -311,13 +311,13 @@ impl<'a> RowFormatter<'a> {
                 bytes_column.bytes
             };
             to_magnitude_and_suffix(size.into(), SuffixType::HumanReadable(h), true)
-        }else {
+        } else {
             match &self.options.block_size {
-                /// if it has a suffix, append it to the size (but not on the 'total' row)
+                // if it has a suffix, append it to the size (but not on the 'total' row)
                 BlockSize::PrefixedBytes(_, suffix) if !self.is_total_row => {
-                    format!("{}{}", size, suffix)
+                    format!("{size}{suffix}")
                 }
-                /// else, just print the raw number as before
+                // else, just print the raw number as before
                 _ => size.to_string(),
             }
         };
@@ -332,11 +332,11 @@ impl<'a> RowFormatter<'a> {
             to_magnitude_and_suffix(size, SuffixType::HumanReadable(h), true)
         } else {
             match &self.options.block_size {
-                /// if it has a suffix, append it to the size (but not on the 'total' row)
+                // if it has a suffix, append it to the size (but not on the 'total' row)
                 BlockSize::PrefixedBytes(_, suffix) if !self.is_total_row => {
-                    format!("{}{}", size, suffix)
+                    format!("{size}{suffix}")
                 }
-                /// else, just print the raw number as before
+                // else, just print the raw number as before
                 _ => size.to_string(),
             }
         };

tests/by-util/test_df.rs

@@ -1172,18 +1172,26 @@ fn test_blocksize_output_suffix() {
     }
 
     let val_m = get_size_value(&["-BM"]);
-    assert!(val_m.ends_with('M'), "Expected suffix 'M', got: {}", val_m);
+    assert!(val_m.ends_with('M'), "Expected suffix 'M', got: {val_m}");
 
     let val_k = get_size_value(&["-BK"]);
-    assert!(val_k.ends_with('K'), "Expected suffix 'K', got: {}", val_k);
+    assert!(val_k.ends_with('K'), "Expected suffix 'K', got: {val_k}");
 
     let val_mega = get_size_value(&["-m"]);
-    assert!(!val_mega.ends_with('M'), "Expected NO suffix 'M' for -m, got: {}", val_mega);
+    assert!(
+        !val_mega.ends_with('M'),
+        "Expected NO suffix 'M' for -m, got: {val_mega}"
+    );
 
     let val_kilo = get_size_value(&["-k"]);
-    assert!(!val_kilo.ends_with('K'), "Expected NO suffix 'K' for -k, got: {}", val_kilo);
+    assert!(
+        !val_kilo.ends_with('K'),
+        "Expected NO suffix 'K' for -k, got: {val_kilo}"
+    );
 
     let val_numeric = get_size_value(&["-B", "1048576"]);
-    assert!(!val_numeric.ends_with('M'), "Expected NO suffix 'M' for numeric blocks, got: {}", val_numeric);
+    assert!(
+        !val_numeric.ends_with('M'),
+        "Expected NO suffix 'M' for numeric blocks, got: {val_numeric}"
+    );
 }
-