chore(criterion_compat): adapt criterion fork to run in the monorepo

Signed-off-by: not-matthias <[email protected]>

Author: not-matthias

Cargo.lock

@@ -2,9 +2,11 @@
 members = [
   "crates/codspeed",
   "crates/bencher_compat",
-  "crates/criterion_compat",
   "crates/cargo-codspeed",
 
+  "crates/criterion_compat",
+  "crates/criterion_compat/criterion_fork",
+
   "crates/divan_compat",
   "crates/divan_compat/macros",
   "crates/divan_compat/divan_fork",
@@ -16,3 +18,4 @@ resolver = "2"
 itertools = "0.14.0"
 serde = { version = "1.0.217", features = ["derive"] }
 serde_json = "1.0.138"
+tempfile = "3.7.0"

Cargo.toml

@@ -29,4 +29,4 @@ name = "native"
 harness = false
 
 [dev-dependencies]
-tempfile = "3.7.0"
+tempfile = { workspace = true }

crates/codspeed/Cargo.toml

@@ -17,7 +17,7 @@ categories = [
 ]
 keywords = ["codspeed", "benchmark", "criterion"]
 [dependencies]
-criterion = { version = "0.5.1", default-features = false }
+criterion = { package = "codspeed-criterion-compat-walltime", path = "./criterion_fork", version = "0.5.1", default-features = false }
 codspeed = { path = "../codspeed", version = "=2.8.1" }
 colored = "2.1.0"
 

crates/criterion_compat/Cargo.toml

@@ -3,7 +3,7 @@ authors = [
   "Jorge Aparicio <[email protected]>",
   "Brook Heisler <[email protected]>",
 ]
-name = "criterion"
+name = "codspeed-criterion-compat-walltime"
 version = "0.5.1"
 edition = "2018"
 
@@ -17,6 +17,7 @@ license     = "Apache-2.0 OR MIT"
 exclude     = ["book/*"]
 
 [dependencies]
+codspeed = { path = "../../codspeed", version = "=2.8.1" }
 anes           = "0.1.4"
 once_cell      = "1.14"
 criterion-plot = { path = "plot", version = "0.5.0" }
@@ -37,7 +38,7 @@ regex          = { version = "1.5", default-features = false, features = ["std"]
 # Optional dependencies
 rayon = { version = "1.3", optional = true }
 csv = { version = "1.1", optional = true }
-futures = { version = "0.3", default_features = false, optional = true }
+futures = { version = "0.3", default-features = false, optional = true }
 smol = { version = "1.2", default-features = false, optional = true }
 tokio = { version = "1.0", default-features = false, features = [
   "rt",
@@ -51,11 +52,11 @@ default-features = false
 features         = ["svg_backend", "area_series", "line_series"]
 
 [dev-dependencies]
-tempfile   = "~3.5.0"
+tempfile   = { workspace = true }
 approx     = "0.5.0"
 quickcheck = { version = "1.0", default-features = false }
 rand       = "0.8"
-futures    = { version = "0.3", default_features = false, features = ["executor"] }
+futures    = { version = "0.3", default-features = false, features = ["executor"] }
 
 [badges]
 maintenance = { status = "passively-maintained" }
@@ -97,16 +98,17 @@ cargo_bench_support = []
 # cargo-criterion's --message-format=json option.
 csv_output = ["csv"]
 
-[workspace]
-exclude = ["cargo-criterion"]
-
 [[bench]]
 name    = "bench_main"
 harness = false
 
 [lib]
 bench = false
+doctest = false
 
 # Enable all of the async runtimes for the docs.rs output
 [package.metadata.docs.rs]
 features = ["async_futures", "async_smol", "async_std", "async_tokio"]
+
+[lints.clippy]
+deprecated_clippy_cfg_attr = "allow"

crates/criterion_compat/criterion_fork/Cargo.toml

@@ -1,3 +1,6 @@
+#![allow(clippy::all, dead_code)]
+extern crate codspeed_criterion_compat_walltime as criterion;
+
 use criterion::criterion_main;
 
 mod benchmarks;

crates/criterion_compat/criterion_fork/benches/bench_main.rs

@@ -24,3 +24,6 @@ rand = "0.8"
 travis-ci = { repository = "bheisler/criterion.rs" }
 appveyor = { repository = "bheisler/criterion.rs", id = "4255ads9ctpupcl2" }
 maintenance = { status = "looking-for-maintainer" }
+
+[lints.clippy]
+deprecated_clippy_cfg_attr = "allow"

crates/criterion_compat/criterion_fork/plot/Cargo.toml

@@ -1,3 +1,5 @@
+#![allow(clippy::all, unexpected_cfgs)]
+
 //! [Criterion]'s plotting library.
 //!
 //! [Criterion]: https://github.com/bheisler/criterion.rs

crates/criterion_compat/criterion_fork/plot/src/lib.rs

@@ -15,9 +15,9 @@
 //! * Produces detailed charts, providing thorough understanding of your code's
 //!   performance behavior.
 
+#![allow(clippy::all, unexpected_cfgs, dead_code)]
 #![warn(missing_docs)]
 #![warn(bare_trait_objects)]
-#![cfg_attr(feature = "real_blackbox", feature(test))]
 #![cfg_attr(
     feature = "cargo-clippy",
     allow(
@@ -39,9 +39,6 @@ extern crate quickcheck;
 use is_terminal::IsTerminal;
 use regex::Regex;
 
-#[cfg(feature = "real_blackbox")]
-extern crate test;
-
 #[macro_use]
 extern crate serde_derive;
 
@@ -155,7 +152,7 @@ fn debug_enabled() -> bool {
 /// This variant is backed by the (unstable) test::black_box function.
 #[cfg(feature = "real_blackbox")]
 pub fn black_box<T>(dummy: T) -> T {
-    test::black_box(dummy)
+    core::hint::black_box(dummy)
 }
 
 /// A function that is opaque to the optimizer, used to prevent the compiler from

crates/criterion_compat/criterion_fork/src/lib.rs

@@ -1,3 +1,6 @@
+#![allow(clippy::all)]
+extern crate codspeed_criterion_compat_walltime as criterion;
+
 #[cfg(feature = "plotters")]
 use criterion::SamplingMode;
 use criterion::{