From 00322b986bfe9311985f64f3401112db12600813 Mon Sep 17 00:00:00 2001
From: nicoo <nicoo@mur.at>
Date: Mon, 17 May 2021 19:22:56 +0200
Subject: [PATCH] factor: Move benchmarks out-of-crate

---
 Cargo.toml                                    |  3 +++
 src/uu/factor/BENCHMARKING.md                 | 13 ++++++----
 src/uu/factor/Cargo.toml                      | 18 +++----------
 tests/benches/factor/Cargo.toml               | 26 +++++++++++++++++++
 .../benches}/factor/benches/gcd.rs            |  0
 .../benches}/factor/benches/table.rs          |  0
 6 files changed, 41 insertions(+), 19 deletions(-)
 create mode 100644 tests/benches/factor/Cargo.toml
 rename {src/uu => tests/benches}/factor/benches/gcd.rs (100%)
 rename {src/uu => tests/benches}/factor/benches/table.rs (100%)

diff --git a/Cargo.toml b/Cargo.toml
index 7c1a771fd..745393260 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -324,6 +324,9 @@ wc       = { optional=true, version="0.0.6", package="uu_wc", path="src/uu/wc" }
 who      = { optional=true, version="0.0.6", package="uu_who", path="src/uu/who" }
 whoami   = { optional=true, version="0.0.6", package="uu_whoami", path="src/uu/whoami" }
 yes      = { optional=true, version="0.0.6", package="uu_yes", path="src/uu/yes" }
+
+factor_benches = { optional = true, version = "0.0.0", package = "uu_factor_benches", path = "tests/benches/factor" }
+
 #
 # * pinned transitive dependencies
 # Not needed for now. Keep as examples:
diff --git a/src/uu/factor/BENCHMARKING.md b/src/uu/factor/BENCHMARKING.md
index cf3bb35d0..e174d62b7 100644
--- a/src/uu/factor/BENCHMARKING.md
+++ b/src/uu/factor/BENCHMARKING.md
@@ -1,15 +1,18 @@
 # Benchmarking `factor`
 
+The benchmarks for `factor` are located under `tests/benches/factor`
+and can be invoked with `cargo bench` in that directory.
+
+They are located outside the `uu_factor` crate, as they do not comply
+with the project's minimum supported Rust version, *i.e.* may require
+a newer version of `rustc`.
+
+
 ## Microbenchmarking deterministic functions
 
 We currently use [`criterion`] to benchmark deterministic functions,
 such as `gcd` and `table::factor`.
 
-Those benchmarks can be simply executed with `cargo bench` as usual,
-but may require a recent version of Rust, *i.e.* the project's minimum
-supported version of Rust does not apply to the benchmarks.
-
-
 However, µbenchmarks are by nature unstable: not only are they specific to
 the hardware, operating system version, etc., but they are noisy and affected
 by other tasks on the system (browser, compile jobs, etc.), which can cause
diff --git a/src/uu/factor/Cargo.toml b/src/uu/factor/Cargo.toml
index cb77c5d19..eb34519f1 100644
--- a/src/uu/factor/Cargo.toml
+++ b/src/uu/factor/Cargo.toml
@@ -17,25 +17,15 @@ num-traits = "0.2.13" # used in src/numerics.rs, which is included by build.rs
 [dependencies]
 coz = { version = "0.1.3", optional = true }
 num-traits = "0.2.13" # Needs at least version 0.2.13 for "OverflowingAdd"
-rand = { version="0.7", features=["small_rng"] }
-smallvec = { version="0.6.14, < 1.0" }
-uucore = { version=">=0.0.8", package="uucore", path="../../uucore" }
-uucore_procs = { version=">=0.0.5", package="uucore_procs", path="../../uucore_procs" }
+rand = { version = "0.7", features = ["small_rng"] }
+smallvec = { version = "0.6.14, < 1.0" }
+uucore = { version = ">=0.0.8", package = "uucore", path = "../../uucore" }
+uucore_procs = { version = ">=0.0.5", package = "uucore_procs", path = "../../uucore_procs" }
 
 [dev-dependencies]
-array-init = "2.0.0"
-criterion = "0.3"
 paste = "0.1.18"
 quickcheck = "0.9.2"
-rand_chacha = "0.2.2"
 
-[[bench]]
-name = "gcd"
-harness = false
-
-[[bench]]
-name = "table"
-harness = false
 
 [[bin]]
 name = "factor"
diff --git a/tests/benches/factor/Cargo.toml b/tests/benches/factor/Cargo.toml
new file mode 100644
index 000000000..b3b718477
--- /dev/null
+++ b/tests/benches/factor/Cargo.toml
@@ -0,0 +1,26 @@
+[package]
+name = "uu_factor_benches"
+version = "0.0.0"
+authors = ["nicoo <nicoo@debian.org>"]
+license = "MIT"
+description = "Benchmarks for the uu_factor integer factorization tool"
+homepage = "https://github.com/uutils/coreutils"
+edition = "2018"
+
+[dependencies]
+uu_factor = { path = "../../../src/uu/factor" }
+
+[dev-dependencies]
+array-init = "2.0.0"
+criterion = "0.3"
+rand = "0.7"
+rand_chacha = "0.2.2"
+
+
+[[bench]]
+name = "gcd"
+harness = false
+
+[[bench]]
+name = "table"
+harness = false
diff --git a/src/uu/factor/benches/gcd.rs b/tests/benches/factor/benches/gcd.rs
similarity index 100%
rename from src/uu/factor/benches/gcd.rs
rename to tests/benches/factor/benches/gcd.rs
diff --git a/src/uu/factor/benches/table.rs b/tests/benches/factor/benches/table.rs
similarity index 100%
rename from src/uu/factor/benches/table.rs
rename to tests/benches/factor/benches/table.rs