number-prefix: Move from 0.2 to 0.4

Author: sylvestre

Cargo.lock

@@ -17,7 +17,7 @@ path = "src/df.rs"
 [dependencies]
 clap = "2.33"
 libc = "0.2"
-number_prefix = "0.2"
+number_prefix = "0.4"
 uucore = { version=">=0.0.4", package="uucore", path="../../uucore" }
 uucore_procs = { version=">=0.0.4", package="uucore_procs", path="../../uucore_procs" }
 

src/uu/df/Cargo.toml

@@ -28,7 +28,7 @@ use winapi::um::fileapi::{
     GetVolumePathNamesForVolumeNameW, QueryDosDeviceW,
 };
 
-use number_prefix::{binary_prefix, decimal_prefix, PrefixNames, Prefixed, Standalone};
+use number_prefix::NumberPrefix;
 use std::cell::Cell;
 use std::collections::HashMap;
 use std::collections::HashSet;
@@ -716,14 +716,14 @@ fn human_readable(value: u64, base: i64) -> String {
 
         // ref: [Binary prefix](https://en.wikipedia.org/wiki/Binary_prefix) @@ <https://archive.is/cnwmF>
         // ref: [SI/metric prefix](https://en.wikipedia.org/wiki/Metric_prefix) @@ <https://archive.is/QIuLj>
-        1000 => match decimal_prefix(value as f64) {
-            Standalone(bytes) => bytes.to_string(),
-            Prefixed(prefix, bytes) => format!("{:.1}{}", bytes, prefix.symbol()),
+        1000 => match NumberPrefix::decimal(value as f64) {
+            NumberPrefix::Standalone(bytes) => bytes.to_string(),
+            NumberPrefix::Prefixed(prefix, bytes) => format!("{:.1}{}", bytes, prefix.symbol()),
         },
 
-        1024 => match binary_prefix(value as f64) {
-            Standalone(bytes) => bytes.to_string(),
-            Prefixed(prefix, bytes) => format!("{:.1}{}", bytes, prefix.symbol()),
+        1024 => match NumberPrefix::binary(value as f64) {
+            NumberPrefix::Standalone(bytes) => bytes.to_string(),
+            NumberPrefix::Prefixed(prefix, bytes) => format!("{:.1}{}", bytes, prefix.symbol()),
         },
 
         _ => crash!(EXIT_ERR, "Internal error: Unknown base value {}", base),

src/uu/df/src/df.rs

@@ -18,7 +18,7 @@ path = "src/ls.rs"
 getopts = "0.2.18"
 isatty = "0.1"
 lazy_static = "1.0.1"
-number_prefix = "0.2.8"
+number_prefix = "0.4"
 term_grid = "0.1.5"
 termsize = "0.1.6"
 time = "0.1.40"

src/uu/ls/Cargo.toml

@@ -24,7 +24,7 @@ extern crate uucore;
 
 #[cfg(unix)]
 use isatty::stdout_isatty;
-use number_prefix::{decimal_prefix, Prefixed, Standalone};
+use number_prefix::NumberPrefix;
 use std::cmp::Reverse;
 #[cfg(unix)]
 use std::collections::HashMap;
@@ -525,9 +525,11 @@ fn display_date(metadata: &Metadata, options: &getopts::Matches) -> String {
 
 fn display_file_size(metadata: &Metadata, options: &getopts::Matches) -> String {
     if options.opt_present("human-readable") {
-        match decimal_prefix(metadata.len() as f64) {
-            Standalone(bytes) => bytes.to_string(),
-            Prefixed(prefix, bytes) => format!("{:.2}{}", bytes, prefix).to_uppercase(),
+        match NumberPrefix::decimal(metadata.len() as f64) {
+            NumberPrefix::Standalone(bytes) => bytes.to_string(),
+            NumberPrefix::Prefixed(prefix, bytes) => {
+                format!("{:.2}{}", bytes, prefix).to_uppercase()
+            }
         }
     } else {
         metadata.len().to_string()