chore(criterion_compat): fork criterion

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",

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,21 +21,13 @@ 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
@@ -44,6 +36,10 @@ bench = false
 name = "bench_main"
 harness = false
 
+[dependencies.codspeed]
+path = "../../codspeed"
+version = "=2.8.1"
+
 [dependencies.anes]
 version = "0.1.4"
 
@@ -93,11 +89,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
 
@@ -152,33 +144,17 @@ default-features = false
 version = "0.8"
 
 [dev-dependencies.tempfile]
-version = "~3.5.0"
+version = "~3.7.0"
 
 [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 = [

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

@@ -12,7 +12,7 @@ use crate::report::BenchmarkId;
 use crate::{fs, Criterion, SavedSample};
 
 // Common comparison procedure
-#[cfg_attr(feature = "cargo-clippy", allow(clippy::type_complexity))]
+#[allow(clippy::type_complexity)]
 pub(crate) fn common<M: Measurement>(
     id: &BenchmarkId,
     avg_times: &Sample<f64>,

crates/criterion_compat/criterion-0.5.1/src/analysis/compare.rs

@@ -15,17 +15,9 @@
 //! * Produces detailed charts, providing thorough understanding of your code's
 //!   performance behavior.
 
+#![allow(clippy::all, dead_code)]
 #![warn(missing_docs)]
 #![warn(bare_trait_objects)]
-#![cfg_attr(feature = "real_blackbox", feature(test))]
-#![cfg_attr(
-    feature = "cargo-clippy",
-    allow(
-        clippy::just_underscores_and_digits, // Used in the stats code
-        clippy::transmute_ptr_to_ptr, // Used in the stats code
-        clippy::manual_non_exhaustive, // Remove when MSRV bumped above 1.40
-    )
-)]
 
 #[cfg(all(feature = "rayon", target_arch = "wasm32"))]
 compile_error!("Rayon cannot be used when targeting wasi32. Try disabling default features.");
@@ -39,9 +31,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 +144,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
@@ -766,7 +755,7 @@ impl<M: Measurement> Criterion<M> {
     /// Configure this criterion struct based on the command-line arguments to
     /// this process.
     #[must_use]
-    #[cfg_attr(feature = "cargo-clippy", allow(clippy::cognitive_complexity))]
+    #[allow(clippy::cognitive_complexity)]
     pub fn configure_from_args(mut self) -> Criterion<M> {
         use clap::{value_parser, Arg, Command};
         let matches = Command::new("Criterion Benchmark")

crates/criterion_compat/criterion-0.5.1/src/lib.rs

@@ -32,7 +32,7 @@ impl AxisScale {
     }
 }
 
-#[cfg_attr(feature = "cargo-clippy", allow(clippy::explicit_counter_loop))]
+#[allow(clippy::explicit_counter_loop)]
 pub fn line_comparison(
     formatter: &dyn ValueFormatter,
     title: &str,

crates/criterion_compat/criterion-0.5.1/src/plot/gnuplot_backend/summary.rs

@@ -400,7 +400,7 @@ impl CliReport {
     }
 
     // Passing a String is the common case here.
-    #[cfg_attr(feature = "cargo-clippy", allow(clippy::needless_pass_by_value))]
+    #[allow(clippy::needless_pass_by_value)]
     fn print_overwritable(&self, s: String) {
         if self.enable_text_overwrite {
             eprint!("{}", s);

crates/criterion_compat/criterion-0.5.1/src/report.rs

@@ -21,7 +21,7 @@ pub struct Data<'a, X, Y>(&'a [X], &'a [Y]);
 
 impl<'a, X, Y> Copy for Data<'a, X, Y> {}
 
-#[cfg_attr(feature = "cargo-clippy", allow(clippy::expl_impl_clone_on_copy))]
+#[allow(clippy::expl_impl_clone_on_copy)]
 impl<'a, X, Y> Clone for Data<'a, X, Y> {
     fn clone(&self) -> Data<'a, X, Y> {
         *self

crates/criterion_compat/criterion-0.5.1/src/stats/bivariate/mod.rs

@@ -12,7 +12,7 @@ where
     stage: Option<(Vec<X>, Vec<Y>)>,
 }
 
-#[cfg_attr(feature = "cargo-clippy", allow(clippy::should_implement_trait))]
+#[allow(clippy::should_implement_trait)]
 impl<'a, X, Y> Resamples<'a, X, Y>
 where
     X: 'a + Float,

crates/criterion_compat/criterion-0.5.1/src/stats/bivariate/resamples.rs

@@ -25,7 +25,7 @@ pub use self::sample::Sample;
 /// - Multithreaded
 /// - Time: `O(nresamples)`
 /// - Memory: `O(nresamples)`
-#[cfg_attr(feature = "cargo-clippy", allow(clippy::cast_lossless))]
+#[allow(clippy::cast_lossless)]
 pub fn bootstrap<A, B, T, S>(
     a: &Sample<A>,
     b: &Sample<B>,

crates/criterion_compat/criterion-0.5.1/src/stats/univariate/mod.rs

@@ -70,7 +70,7 @@ where
     /// Returns the number of data points per label
     ///
     /// - Time: `O(length)`
-    #[cfg_attr(feature = "cargo-clippy", allow(clippy::similar_names))]
+    #[allow(clippy::similar_names)]
     pub fn count(&self) -> (usize, usize, usize, usize, usize) {
         let (mut los, mut lom, mut noa, mut him, mut his) = (0, 0, 0, 0, 0);
 
@@ -129,7 +129,7 @@ where
 {
     type Output = Label;
 
-    #[cfg_attr(feature = "cargo-clippy", allow(clippy::similar_names))]
+    #[allow(clippy::similar_names)]
     fn index(&self, i: usize) -> &Label {
         static LOW_SEVERE: Label = LowSevere;
         static LOW_MILD: Label = LowMild;
@@ -181,7 +181,7 @@ where
 {
     type Item = (A, Label);
 
-    #[cfg_attr(feature = "cargo-clippy", allow(clippy::similar_names))]
+    #[allow(clippy::similar_names)]
     fn next(&mut self) -> Option<(A, Label)> {
         self.iter.next().map(|&x| {
             let (lost, lomt, himt, hist) = self.fences;