Merge pull request #3716 from cakebaker/numfmt_reject_suffix

numfmt: reject suffix if unit is "none"

src/uu/numfmt/src/format.rs

@@ -130,6 +130,12 @@ fn remove_suffix(i: f64, s: Option<Suffix>, u: &Unit) -> Result<f64> {
             "missing 'i' suffix in input: '{}{:?}' (e.g Ki/Mi/Gi)",
             i, raw_suffix
         )),
+        (Some((raw_suffix, with_i)), &Unit::None) => Err(format!(
+            "rejecting suffix in input: '{}{:?}{}' (consider using --from)",
+            i,
+            raw_suffix,
+            if with_i { "i" } else { "" }
+        )),
         (None, _) => Ok(i),
         (_, _) => Err("This suffix is unsupported for specified unit".to_owned()),
     }

tests/by-util/test_numfmt.rs

@@ -646,3 +646,19 @@ fn test_invalid_unit_size() {
         }
     }
 }
+
+#[test]
+fn test_valid_but_forbidden_suffix() {
+    let numbers = vec!["12K", "12Ki"];
+
+    for number in numbers {
+        new_ucmd!()
+            .arg(number)
+            .fails()
+            .code_is(2)
+            .stderr_contains(format!(
+                "rejecting suffix in input: '{}' (consider using --from)",
+                number
+            ));
+    }
+}