Group units, formatting, and statistics under quantity

src/export/csv.rs

@@ -5,7 +5,7 @@ use csv::WriterBuilder;
 use super::Exporter;
 use crate::benchmark::benchmark_result::BenchmarkResult;
 use crate::options::SortOrder;
-use crate::util::units::Unit;
+use crate::quantity::TimeUnit;
 
 use anyhow::Result;
 
@@ -16,7 +16,7 @@ impl Exporter for CsvExporter {
     fn serialize(
         &self,
         results: &[BenchmarkResult],
-        _unit: Option<Unit>,
+        _unit: Option<TimeUnit>,
         _sort_order: SortOrder,
     ) -> Result<Vec<u8>> {
         let mut writer = WriterBuilder::new().from_writer(vec![]);
@@ -110,7 +110,7 @@ fn test_csv() {
 
     let actual = String::from_utf8(
         exporter
-            .serialize(&results, Some(Unit::Second), SortOrder::Command)
+            .serialize(&results, Some(TimeUnit::Second), SortOrder::Command)
             .unwrap(),
     )
     .unwrap();

src/export/json.rs

@@ -4,7 +4,7 @@ use serde_json::to_vec_pretty;
 use super::Exporter;
 use crate::benchmark::benchmark_result::BenchmarkResult;
 use crate::options::SortOrder;
-use crate::util::units::Unit;
+use crate::quantity::TimeUnit;
 
 use anyhow::Result;
 
@@ -20,7 +20,7 @@ impl Exporter for JsonExporter {
     fn serialize(
         &self,
         results: &[BenchmarkResult],
-        _unit: Option<Unit>,
+        _unit: Option<TimeUnit>,
         _sort_order: SortOrder,
     ) -> Result<Vec<u8>> {
         let mut output = to_vec_pretty(&HyperfineSummary { results });

src/export/markup.rs

@@ -1,8 +1,7 @@
 use crate::benchmark::relative_speed::BenchmarkResultWithRelativeSpeed;
 use crate::benchmark::{benchmark_result::BenchmarkResult, relative_speed};
 use crate::options::SortOrder;
-use crate::output::format::format_duration_value;
-use crate::util::units::Unit;
+use crate::quantity::{format_duration_value, TimeUnit};
 
 use super::Exporter;
 use anyhow::Result;
@@ -13,7 +12,11 @@ pub enum Alignment {
 }
 
 pub trait MarkupExporter {
-    fn table_results(&self, entries: &[BenchmarkResultWithRelativeSpeed], unit: Unit) -> String {
+    fn table_results(
+        &self,
+        entries: &[BenchmarkResultWithRelativeSpeed],
+        unit: TimeUnit,
+    ) -> String {
         // prepare table header strings
         let notation = format!("[{}]", unit.short_name());
 
@@ -95,13 +98,13 @@ pub trait MarkupExporter {
     fn command(&self, size: &str) -> String;
 }
 
-fn determine_unit_from_results(results: &[BenchmarkResult]) -> Unit {
+fn determine_unit_from_results(results: &[BenchmarkResult]) -> TimeUnit {
     if let Some(first_result) = results.first() {
         // Use the first BenchmarkResult entry to determine the unit for all entries.
         format_duration_value(first_result.mean, None).1
     } else {
         // Default to `Second`.
-        Unit::Second
+        TimeUnit::Second
     }
 }
 
@@ -109,7 +112,7 @@ impl<T: MarkupExporter> Exporter for T {
     fn serialize(
         &self,
         results: &[BenchmarkResult],
-        unit: Option<Unit>,
+        unit: Option<TimeUnit>,
         sort_order: SortOrder,
     ) -> Result<Vec<u8>> {
         let unit = unit.unwrap_or_else(|| determine_unit_from_results(results));

src/export/mod.rs

@@ -19,7 +19,7 @@ use self::orgmode::OrgmodeExporter;
 use crate::benchmark::benchmark_result::BenchmarkResult;
 use crate::options::SortOrder;
 use crate::output::console_writeln;
-use crate::util::units::Unit;
+use crate::quantity::TimeUnit;
 
 use anyhow::{Context, Result};
 use clap::ArgMatches;
@@ -49,7 +49,7 @@ trait Exporter {
     fn serialize(
         &self,
         results: &[BenchmarkResult],
-        unit: Option<Unit>,
+        unit: Option<TimeUnit>,
         sort_order: SortOrder,
     ) -> Result<Vec<u8>>;
 }
@@ -67,7 +67,7 @@ struct ExporterWithTarget {
 /// Handles the management of multiple file exporters.
 pub struct ExportManager {
     exporters: Vec<ExporterWithTarget>,
-    time_unit: Option<Unit>,
+    time_unit: Option<TimeUnit>,
     sort_order: SortOrder,
 }
 
@@ -76,7 +76,7 @@ impl ExportManager {
     /// in the given ArgMatches
     pub fn from_cli_arguments(
         matches: &ArgMatches,
-        time_unit: Option<Unit>,
+        time_unit: Option<TimeUnit>,
         sort_order: SortOrder,
     ) -> Result<Self> {
         let mut export_manager = Self {

src/export/tests.rs

@@ -2,13 +2,13 @@ use super::Exporter;
 use crate::benchmark::benchmark_result::BenchmarkResult;
 use crate::export::asciidoc::AsciidocExporter;
 use crate::export::orgmode::OrgmodeExporter;
-use crate::util::units::Unit;
+use crate::quantity::TimeUnit;
 use crate::{export::markdown::MarkdownExporter, options::SortOrder};
 use std::collections::BTreeMap;
 
 fn get_output<E: Exporter + Default>(
     results: &[BenchmarkResult],
-    unit: Option<Unit>,
+    unit: Option<TimeUnit>,
     sort_order: SortOrder,
 ) -> String {
     let exporter = E::default();
@@ -206,14 +206,14 @@ fn test_markup_export_manual_ms() {
         },
     ];
 
-    insta::assert_snapshot!(get_output::<MarkdownExporter>(&timing_results, Some(Unit::MilliSecond), SortOrder::Command), @r#"
+    insta::assert_snapshot!(get_output::<MarkdownExporter>(&timing_results, Some(TimeUnit::MilliSecond), SortOrder::Command), @r#"
     | Command | Mean [ms] | Min [ms] | Max [ms] | Relative |
     |:---|---:|---:|---:|---:|
     | `sleep 2` | 2005.0 ± 2.0 | 2002.0 | 2008.0 | 18.97 ± 0.29 |
     | `sleep 0.1` | 105.7 ± 1.6 | 102.3 | 108.0 | 1.00 |
     "#);
 
-    insta::assert_snapshot!(get_output::<AsciidocExporter>(&timing_results, Some(Unit::MilliSecond), SortOrder::Command), @r#"
+    insta::assert_snapshot!(get_output::<AsciidocExporter>(&timing_results, Some(TimeUnit::MilliSecond), SortOrder::Command), @r#"
     [cols="<,>,>,>,>"]
     |===
     | Command 
@@ -236,7 +236,7 @@ fn test_markup_export_manual_ms() {
     |===
     "#);
 
-    insta::assert_snapshot!(get_output::<OrgmodeExporter>(&timing_results, Some(Unit::MilliSecond), SortOrder::Command), @r#"
+    insta::assert_snapshot!(get_output::<OrgmodeExporter>(&timing_results, Some(TimeUnit::MilliSecond), SortOrder::Command), @r#"
     | Command  |  Mean [ms] |  Min [ms] |  Max [ms] |  Relative |
     |--+--+--+--+--|
     | =sleep 2=  |  2005.0 ± 2.0 |  2002.0 |  2008.0 |  18.97 ± 0.29 |
@@ -280,21 +280,21 @@ fn test_markup_export_manual_s() {
         },
     ];
 
-    insta::assert_snapshot!(get_output::<MarkdownExporter>(&results, Some(Unit::Second), SortOrder::Command), @r#"
+    insta::assert_snapshot!(get_output::<MarkdownExporter>(&results, Some(TimeUnit::Second), SortOrder::Command), @r#"
         | Command | Mean [s] | Min [s] | Max [s] | Relative |
         |:---|---:|---:|---:|---:|
         | `sleep 2` | 2.005 ± 0.002 | 2.002 | 2.008 | 18.97 ± 0.29 |
         | `sleep 0.1` | 0.106 ± 0.002 | 0.102 | 0.108 | 1.00 |
         "#);
 
-    insta::assert_snapshot!(get_output::<MarkdownExporter>(&results, Some(Unit::Second), SortOrder::MeanTime), @r#"
+    insta::assert_snapshot!(get_output::<MarkdownExporter>(&results, Some(TimeUnit::Second), SortOrder::MeanTime), @r#"
         | Command | Mean [s] | Min [s] | Max [s] | Relative |
         |:---|---:|---:|---:|---:|
         | `sleep 0.1` | 0.106 ± 0.002 | 0.102 | 0.108 | 1.00 |
         | `sleep 2` | 2.005 ± 0.002 | 2.002 | 2.008 | 18.97 ± 0.29 |
         "#);
 
-    insta::assert_snapshot!(get_output::<AsciidocExporter>(&results, Some(Unit::Second), SortOrder::Command), @r#"
+    insta::assert_snapshot!(get_output::<AsciidocExporter>(&results, Some(TimeUnit::Second), SortOrder::Command), @r#"
     [cols="<,>,>,>,>"]
     |===
     | Command