feat(criterion): support explicit lifetime for BenchmarkGroup

Author: art049

crates/criterion_compat/benches/test_benches.rs

@@ -1,4 +1,7 @@
-use codspeed_criterion_compat::{criterion_group, criterion_main, Bencher, BenchmarkId, Criterion};
+use codspeed_criterion_compat::{
+    criterion_group, criterion_main, Bencher, BenchmarkGroup, BenchmarkId, Criterion,
+};
+use criterion::measurement::WallTime;
 
 fn bench(c: &mut Criterion) {
     // Setup (construct data, allocate memory, etc)
@@ -31,6 +34,25 @@ fn bench_with_explicit_lifetime(c: &mut Criterion) {
     );
 }
 
+#[cfg(codspeed)]
+fn bench_using_group_without_explicit_measurement(c: &mut Criterion) {
+    let mut group = c.benchmark_group("group");
+    fn using_group(g: &mut BenchmarkGroup) {
+        g.bench_function("bench_without_explicit_measurement", |b| b.iter(|| 2 + 2));
+    }
+    using_group(&mut group);
+    group.finish();
+}
+
+fn bench_using_group_with_explicit_measurement(c: &mut Criterion) {
+    let mut group = c.benchmark_group("group");
+    fn using_group(g: &mut BenchmarkGroup<'_, WallTime>) {
+        g.bench_function("bench_explicit_measurement", |b| b.iter(|| 2 + 2));
+    }
+    using_group(&mut group);
+    group.finish();
+}
+
 mod nested {
     use super::*;
     pub fn bench(c: &mut Criterion) {
@@ -48,5 +70,22 @@ mod nested {
     }
 }
 
-criterion_group!(benches, bench, bench_with_explicit_lifetime, nested::bench);
+criterion_group!(
+    benches,
+    bench,
+    bench_with_explicit_lifetime,
+    nested::bench,
+    bench_using_group_with_explicit_measurement,
+);
+
+#[cfg(not(codspeed))]
 criterion_main!(benches);
+
+#[cfg(codspeed)]
+criterion_group!(
+    only_codspeed,
+    bench_using_group_without_explicit_measurement
+);
+
+#[cfg(codspeed)]
+criterion_main!(benches, only_codspeed);

crates/criterion_compat/src/compat/group.rs

@@ -9,15 +9,15 @@ use crate::{Bencher, Criterion};
 
 /// Deprecated: using the default measurement will be removed in the next major version.
 /// Defaulting to WallTime differs from the original BenchmarkGroup implementation but avoids creating a breaking change
-pub struct BenchmarkGroup<M: Measurement = WallTime> {
+pub struct BenchmarkGroup<'a, M: Measurement = WallTime> {
     codspeed: Rc<RefCell<CodSpeed>>,
     current_file: String,
     macro_group: String,
     group_name: String,
-    _marker: PhantomData<*const M>,
+    _marker: PhantomData<&'a M>,
 }
 
-impl<M: Measurement> BenchmarkGroup<M> {
+impl<'a, M: Measurement> BenchmarkGroup<'a, M> {
     pub fn new(criterion: &mut Criterion<M>, group_name: String) -> BenchmarkGroup<M> {
         BenchmarkGroup::<M> {
             codspeed: criterion
@@ -79,7 +79,7 @@ impl<M: Measurement> BenchmarkGroup<M> {
 
 // Dummy methods
 #[allow(unused_variables)]
-impl<M: Measurement> BenchmarkGroup<M> {
+impl<'a, M: Measurement> BenchmarkGroup<'a, M> {
     pub fn sample_size(&mut self, n: usize) -> &mut Self {
         self
     }