From e5e4c8c0206c65b5c1b9be3c8660db1a1aa55863 Mon Sep 17 00:00:00 2001
From: David Peter <mail@david-peter.de>
Date: Sun, 6 Feb 2022 19:37:15 +0100
Subject: [PATCH] New 'benchmark' module folder

---
 src/{benchmark.rs => benchmark/mod.rs}           | 4 +++-
 src/{benchmark_result.rs => benchmark/result.rs} | 0
 src/export/asciidoc.rs                           | 2 +-
 src/export/csv.rs                                | 2 +-
 src/export/json.rs                               | 2 +-
 src/export/markdown.rs                           | 2 +-
 src/export/mod.rs                                | 2 +-
 src/main.rs                                      | 3 +--
 src/relative_speed.rs                            | 3 ++-
 9 files changed, 11 insertions(+), 9 deletions(-)
 rename src/{benchmark.rs => benchmark/mod.rs} (99%)
 rename src/{benchmark_result.rs => benchmark/result.rs} (100%)

diff --git a/src/benchmark.rs b/src/benchmark/mod.rs
similarity index 99%
rename from src/benchmark.rs
rename to src/benchmark/mod.rs
index 204354e..2d532ea 100644
--- a/src/benchmark.rs
+++ b/src/benchmark/mod.rs
@@ -1,10 +1,12 @@
+pub mod result;
+
 use std::cmp;
 use std::process::{ExitStatus, Stdio};
 
 use colored::*;
 use statistical::{mean, median, standard_deviation};
 
-use crate::benchmark_result::BenchmarkResult;
+use crate::benchmark::result::BenchmarkResult;
 use crate::command::Command;
 use crate::format::{format_duration, format_duration_unit};
 use crate::min_max::{max, min};
diff --git a/src/benchmark_result.rs b/src/benchmark/result.rs
similarity index 100%
rename from src/benchmark_result.rs
rename to src/benchmark/result.rs
diff --git a/src/export/asciidoc.rs b/src/export/asciidoc.rs
index b568b63..898c1b1 100644
--- a/src/export/asciidoc.rs
+++ b/src/export/asciidoc.rs
@@ -1,4 +1,4 @@
-use crate::benchmark_result::BenchmarkResult;
+use crate::benchmark::result::BenchmarkResult;
 use crate::format::format_duration_value;
 use crate::relative_speed::{self, BenchmarkResultWithRelativeSpeed};
 use crate::units::Unit;
diff --git a/src/export/csv.rs b/src/export/csv.rs
index cb3e4ae..4c5b060 100644
--- a/src/export/csv.rs
+++ b/src/export/csv.rs
@@ -3,7 +3,7 @@ use std::borrow::Cow;
 use csv::WriterBuilder;
 
 use super::Exporter;
-use crate::benchmark_result::BenchmarkResult;
+use crate::benchmark::result::BenchmarkResult;
 use crate::units::Unit;
 
 use anyhow::Result;
diff --git a/src/export/json.rs b/src/export/json.rs
index ba932e8..a0cc5d9 100644
--- a/src/export/json.rs
+++ b/src/export/json.rs
@@ -2,7 +2,7 @@ use serde::*;
 use serde_json::to_vec_pretty;
 
 use super::Exporter;
-use crate::benchmark_result::BenchmarkResult;
+use crate::benchmark::result::BenchmarkResult;
 use crate::units::Unit;
 
 use anyhow::Result;
diff --git a/src/export/markdown.rs b/src/export/markdown.rs
index 1b14f70..d8f33b5 100644
--- a/src/export/markdown.rs
+++ b/src/export/markdown.rs
@@ -1,5 +1,5 @@
 use super::Exporter;
-use crate::benchmark_result::BenchmarkResult;
+use crate::benchmark::result::BenchmarkResult;
 use crate::format::format_duration_value;
 use crate::relative_speed::{self, BenchmarkResultWithRelativeSpeed};
 use crate::units::Unit;
diff --git a/src/export/mod.rs b/src/export/mod.rs
index 9b6beee..feb5dd4 100644
--- a/src/export/mod.rs
+++ b/src/export/mod.rs
@@ -11,7 +11,7 @@ use self::csv::CsvExporter;
 use self::json::JsonExporter;
 use self::markdown::MarkdownExporter;
 
-use crate::benchmark_result::BenchmarkResult;
+use crate::benchmark::result::BenchmarkResult;
 use crate::units::Unit;
 
 use anyhow::{Context, Result};
diff --git a/src/main.rs b/src/main.rs
index bacb56f..0c96243 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -4,7 +4,6 @@ use colored::*;
 
 pub mod app;
 pub mod benchmark;
-pub mod benchmark_result;
 pub mod command;
 pub mod error;
 pub mod export;
@@ -23,8 +22,8 @@ pub mod units;
 pub mod warnings;
 
 use app::get_arg_matches;
+use benchmark::result::BenchmarkResult;
 use benchmark::{mean_shell_spawning_time, run_benchmark};
-use benchmark_result::BenchmarkResult;
 use command::{build_commands, Command};
 use export::ExportManager;
 use options::{Options, OutputStyleOption};
diff --git a/src/relative_speed.rs b/src/relative_speed.rs
index 093e3c5..7bc7353 100644
--- a/src/relative_speed.rs
+++ b/src/relative_speed.rs
@@ -1,6 +1,7 @@
 use std::cmp::Ordering;
 
-use crate::{benchmark_result::BenchmarkResult, units::Scalar};
+use crate::benchmark::result::BenchmarkResult;
+use crate::units::Scalar;
 
 #[derive(Debug)]
 pub struct BenchmarkResultWithRelativeSpeed<'a> {