From 6fe7738165940282939701ba4fa722d1128a93a6 Mon Sep 17 00:00:00 2001
From: David Peter <mail@david-peter.de>
Date: Sun, 15 May 2022 20:44:34 +0200
Subject: [PATCH] Do not pass 'unit' into determine_unit_from_results

---
 src/export/markdown.rs |  2 +-
 src/export/mod.rs      | 19 ++++++++-----------
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/src/export/markdown.rs b/src/export/markdown.rs
index ee60e18..b301642 100644
--- a/src/export/markdown.rs
+++ b/src/export/markdown.rs
@@ -28,7 +28,7 @@ pub struct MarkdownExporter {}
 
 impl Exporter for MarkdownExporter {
     fn serialize(&self, results: &[BenchmarkResult], unit: Option<Unit>) -> Result<Vec<u8>> {
-        let unit = determine_unit_from_results(results, unit);
+        let unit = unit.unwrap_or_else(|| determine_unit_from_results(&results));
         let entries = relative_speed::compute(results);
         if entries.is_none() {
             return Err(anyhow!(
diff --git a/src/export/mod.rs b/src/export/mod.rs
index 59719fd..e388f68 100644
--- a/src/export/mod.rs
+++ b/src/export/mod.rs
@@ -19,17 +19,14 @@ use crate::util::units::Unit;
 use anyhow::{Context, Result};
 use clap::ArgMatches;
 
-pub fn determine_unit_from_results(results: &[BenchmarkResult], unit: Option<Unit>) -> Unit {
-    return if let Some(unit) = unit {
-        // Use the given unit for all entries.
-        unit
-    } else if let Some(first_result) = results.first() {
+pub fn determine_unit_from_results(results: &[BenchmarkResult]) -> Unit {
+    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
-    };
+    }
 }
 
 /// The desired form of exporter to use for a given file.
@@ -170,7 +167,7 @@ fn test_markup_table_unit_given_s() {
     ];
     let unit = Some(Unit::Second);
 
-    let markup_actual = determine_unit_from_results(&results, unit);
+    let markup_actual = unit.unwrap_or_else(|| determine_unit_from_results(&results));
     let markup_expected = Unit::Second;
 
     assert_eq!(markup_expected, markup_actual);
@@ -210,7 +207,7 @@ fn test_markup_table_unit_given_ms() {
     ];
     let unit = Some(Unit::MilliSecond);
 
-    let markup_actual = determine_unit_from_results(&results, unit);
+    let markup_actual = unit.unwrap_or_else(|| determine_unit_from_results(&results));
     let markup_expected = Unit::MilliSecond;
 
     assert_eq!(markup_expected, markup_actual);
@@ -250,7 +247,7 @@ fn test_markup_table_unit_first_s() {
     ];
     let unit = None;
 
-    let markup_actual = determine_unit_from_results(&results, unit);
+    let markup_actual = unit.unwrap_or_else(|| determine_unit_from_results(&results));
     let markup_expected = Unit::Second;
 
     assert_eq!(markup_expected, markup_actual);
@@ -290,7 +287,7 @@ fn test_markup_table_unit_first_ms() {
     ];
     let unit = None;
 
-    let markup_actual = determine_unit_from_results(&results, unit);
+    let markup_actual = unit.unwrap_or_else(|| determine_unit_from_results(&results));
     let markup_expected = Unit::MilliSecond;
 
     assert_eq!(markup_expected, markup_actual);
@@ -302,7 +299,7 @@ fn test_markup_table_unit_default_s() {
     let results: Vec<BenchmarkResult> = vec![];
     let unit = None;
 
-    let markup_actual = determine_unit_from_results(&results, unit);
+    let markup_actual = unit.unwrap_or_else(|| determine_unit_from_results(&results));
     let markup_expected = Unit::Second;
 
     assert_eq!(markup_expected, markup_actual);