Group units, formatting, and statistics under quantity

src/output/format.rs

@@ -1,78 +0,0 @@
-use crate::util::units::{Second, Unit};
-
-/// Format the given duration as a string. The output-unit can be enforced by setting `unit` to
-/// `Some(target_unit)`. If `unit` is `None`, it will be determined automatically.
-pub fn format_duration(duration: Second, unit: Option<Unit>) -> String {
-    let (duration_fmt, _) = format_duration_unit(duration, unit);
-    duration_fmt
-}
-
-/// Like `format_duration`, but returns the target unit as well.
-pub fn format_duration_unit(duration: Second, unit: Option<Unit>) -> (String, Unit) {
-    let (out_str, out_unit) = format_duration_value(duration, unit);
-
-    (format!("{} {}", out_str, out_unit.short_name()), out_unit)
-}
-
-/// Like `format_duration`, but returns the target unit as well.
-pub fn format_duration_value(duration: Second, unit: Option<Unit>) -> (String, Unit) {
-    if (duration < 0.001 && unit.is_none()) || unit == Some(Unit::MicroSecond) {
-        (Unit::MicroSecond.format(duration), Unit::MicroSecond)
-    } else if (duration < 1.0 && unit.is_none()) || unit == Some(Unit::MilliSecond) {
-        (Unit::MilliSecond.format(duration), Unit::MilliSecond)
-    } else {
-        let unit = unit.unwrap_or(Unit::Second);
-        (unit.format(duration), unit)
-    }
-}
-
-#[test]
-fn test_format_duration_unit_basic() {
-    let (out_str, out_unit) = format_duration_unit(1.3, None);
-
-    assert_eq!("1.300 s", out_str);
-    assert_eq!(Unit::Second, out_unit);
-
-    let (out_str, out_unit) = format_duration_unit(1.0, None);
-
-    assert_eq!("1.000 s", out_str);
-    assert_eq!(Unit::Second, out_unit);
-
-    let (out_str, out_unit) = format_duration_unit(0.999, None);
-
-    assert_eq!("999.0 ms", out_str);
-    assert_eq!(Unit::MilliSecond, out_unit);
-
-    let (out_str, out_unit) = format_duration_unit(0.0005, None);
-
-    assert_eq!("500.0 µs", out_str);
-    assert_eq!(Unit::MicroSecond, out_unit);
-
-    let (out_str, out_unit) = format_duration_unit(0.0, None);
-
-    assert_eq!("0.0 µs", out_str);
-    assert_eq!(Unit::MicroSecond, out_unit);
-
-    let (out_str, out_unit) = format_duration_unit(1000.0, None);
-
-    assert_eq!("1000.000 s", out_str);
-    assert_eq!(Unit::Second, out_unit);
-}
-
-#[test]
-fn test_format_duration_unit_with_unit() {
-    let (out_str, out_unit) = format_duration_unit(1.3, Some(Unit::Second));
-
-    assert_eq!("1.300 s", out_str);
-    assert_eq!(Unit::Second, out_unit);
-
-    let (out_str, out_unit) = format_duration_unit(1.3, Some(Unit::MilliSecond));
-
-    assert_eq!("1300.0 ms", out_str);
-    assert_eq!(Unit::MilliSecond, out_unit);
-
-    let (out_str, out_unit) = format_duration_unit(1.3, Some(Unit::MicroSecond));
-
-    assert_eq!("1300000.0 µs", out_str);
-    assert_eq!(Unit::MicroSecond, out_unit);
-}

src/output/mod.rs

@@ -1,4 +1,3 @@
-pub mod format;
 pub mod progress_bar;
 pub mod warnings;
 

src/output/warnings.rs

@@ -1,8 +1,7 @@
 use std::fmt;
 
 use crate::benchmark::MIN_EXECUTION_TIME;
-use crate::output::format::format_duration;
-use crate::quantity::{second, Time};
+use crate::quantity::{format_duration, second, Time};
 
 pub struct OutlierWarningOptions {
     pub warmup_in_use: bool,