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-0.5.1",
+
   "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-0.5.1", version = "0.5.1", default-features = false }
 codspeed = { path = "../codspeed", version = "=2.8.1" }
 colored = "2.1.0"
 

crates/criterion_compat/Cargo.toml

@@ -11,7 +11,7 @@
 
 [package]
 edition = "2018"
-name = "criterion"
+name = "codspeed-criterion-compat-walltime"
 version = "0.5.1"
 authors = [
     "Jorge Aparicio <[email protected]>",
@@ -21,29 +21,26 @@ exclude = ["book/*"]
 description = "Statistics-driven micro-benchmarking library"
 homepage = "https://bheisler.github.io/criterion.rs/book/index.html"
 readme = "README.md"
-keywords = [
-    "criterion",
-    "benchmark",
-]
+keywords = ["criterion", "benchmark"]
 categories = ["development-tools::profiling"]
 license = "Apache-2.0 OR MIT"
 repository = "https://github.com/bheisler/criterion.rs"
 
 [package.metadata.docs.rs]
-features = [
-    "async_futures",
-    "async_smol",
-    "async_std",
-    "async_tokio",
-]
+features = ["async_futures", "async_smol", "async_std", "async_tokio"]
 
 [lib]
 bench = false
+doctest = false
 
 [[bench]]
 name = "bench_main"
 harness = false
 
+[dependencies.codspeed]
+path = "../../codspeed"
+version = "=2.8.1"
+
 [dependencies.anes]
 version = "0.1.4"
 
@@ -72,7 +69,7 @@ optional = true
 [dependencies.futures]
 version = "0.3"
 optional = true
-default_features = false
+default-features = false
 
 [dependencies.is-terminal]
 version = "0.4.6"
@@ -93,11 +90,7 @@ version = "11.1"
 
 [dependencies.plotters]
 version = "^0.3.1"
-features = [
-    "svg_backend",
-    "area_series",
-    "line_series",
-]
+features = ["svg_backend", "area_series", "line_series"]
 optional = true
 default-features = false
 
@@ -142,7 +135,7 @@ version = "0.5.0"
 [dev-dependencies.futures]
 version = "0.3"
 features = ["executor"]
-default_features = false
+default-features = false
 
 [dev-dependencies.quickcheck]
 version = "1.0"
@@ -152,33 +145,17 @@ default-features = false
 version = "0.8"
 
 [dev-dependencies.tempfile]
-version = "~3.5.0"
+workspace = true
 
 [features]
 async = ["futures"]
-async_futures = [
-    "futures/executor",
-    "async",
-]
-async_smol = [
-    "smol",
-    "async",
-]
-async_std = [
-    "async-std",
-    "async",
-]
-async_tokio = [
-    "tokio",
-    "async",
-]
+async_futures = ["futures/executor", "async"]
+async_smol = ["smol", "async"]
+async_std = ["async-std", "async"]
+async_tokio = ["tokio", "async"]
 cargo_bench_support = []
 csv_output = ["csv"]
-default = [
-    "rayon",
-    "plotters",
-    "cargo_bench_support",
-]
+default = ["rayon", "plotters", "cargo_bench_support"]
 html_reports = []
 real_blackbox = []
 stable = [
@@ -192,3 +169,6 @@ stable = [
 
 [badges.maintenance]
 status = "passively-maintained"
+
+[lints.clippy]
+deprecated_clippy_cfg_attr = "allow"

crates/criterion_compat/criterion-0.5.1/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-0.5.1/benches/bench_main.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-0.5.1/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::{