|
|
@@ -6,19 +6,19 @@ static IEC_PREFIXES: &'static [&'static str] = &[
|
|
|
"", "Ki", "Mi", "Gi", "Ti", "Pi", "Ei", "Zi", "Yi"
|
|
|
];
|
|
|
|
|
|
-fn format_bytes(mut amount: u64, kilo: u64, prefixes: &[&str]) -> String {
|
|
|
+fn format_bytes(mut amount: u64, kilo: u64, prefixes: &[&str]) -> (String, String) {
|
|
|
let mut prefix = 0;
|
|
|
while amount > kilo {
|
|
|
amount /= kilo;
|
|
|
prefix += 1;
|
|
|
}
|
|
|
- format!("{}{}", amount, prefixes[prefix])
|
|
|
+ return (format!("{}", amount), prefixes[prefix].to_string());
|
|
|
}
|
|
|
|
|
|
-pub fn format_IEC_bytes(amount: u64) -> String {
|
|
|
+pub fn format_IEC_bytes(amount: u64) -> (String, String) {
|
|
|
format_bytes(amount, 1024, IEC_PREFIXES)
|
|
|
}
|
|
|
|
|
|
-pub fn format_metric_bytes(amount: u64) -> String {
|
|
|
+pub fn format_metric_bytes(amount: u64) -> (String, String) {
|
|
|
format_bytes(amount, 1000, METRIC_PREFIXES)
|
|
|
}
|