From d40f04e32c47f3df782807bb923ca74d35eb405d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damir=20Jeli=C4=87?= <poljar@termina.org.uk>
Date: Thu, 24 Jul 2025 17:01:47 +0200
Subject: [PATCH] chore: Remove the criterion function in the benchmarks

It's now equivalent to Criterion::default().
---
 benchmarks/benches/crypto_bench.rs | 10 ++--------
 benchmarks/benches/event_cache.rs  |  8 +-------
 benchmarks/benches/linked_chunk.rs |  8 +-------
 benchmarks/benches/room_bench.rs   |  6 +-----
 benchmarks/benches/store_bench.rs  |  8 +-------
 benchmarks/benches/timeline.rs     |  6 +-----
 6 files changed, 7 insertions(+), 39 deletions(-)

diff --git a/benchmarks/benches/crypto_bench.rs b/benchmarks/benches/crypto_bench.rs
index 9b21d8a0b..63114b2fe 100644
--- a/benchmarks/benches/crypto_bench.rs
+++ b/benchmarks/benches/crypto_bench.rs
@@ -285,23 +285,17 @@ pub fn devices_missing_sessions_collecting(c: &mut Criterion) {
     group.finish()
 }
 
-fn criterion() -> Criterion {
-    let criterion = Criterion::default();
-
-    criterion
-}
-
 #[cfg(not(feature = "codspeed"))]
 criterion_group! {
     name = benches;
-    config = criterion();
+    config = Criterion::default();
     targets = keys_query, keys_claiming, room_key_sharing, devices_missing_sessions_collecting,
 }
 
 #[cfg(feature = "codspeed")]
 criterion_group! {
     name = benches;
-    config = criterion();
+    config = Criterion::default();
     targets = keys_query, room_key_sharing, devices_missing_sessions_collecting,
 }
 
diff --git a/benchmarks/benches/event_cache.rs b/benchmarks/benches/event_cache.rs
index 4a38903ae..d61d6a941 100644
--- a/benchmarks/benches/event_cache.rs
+++ b/benchmarks/benches/event_cache.rs
@@ -133,15 +133,9 @@ fn handle_room_updates(c: &mut Criterion) {
     group.finish()
 }
 
-fn criterion() -> Criterion {
-    let criterion = Criterion::default();
-
-    criterion
-}
-
 criterion_group! {
     name = event_cache;
-    config = criterion();
+    config = Criterion::default();
     targets = handle_room_updates,
 }
 
diff --git a/benchmarks/benches/linked_chunk.rs b/benchmarks/benches/linked_chunk.rs
index f9b6e9b18..61ff49746 100644
--- a/benchmarks/benches/linked_chunk.rs
+++ b/benchmarks/benches/linked_chunk.rs
@@ -260,15 +260,9 @@ fn reading(c: &mut Criterion) {
     group.finish()
 }
 
-fn criterion() -> Criterion {
-    let criterion = Criterion::default();
-
-    criterion
-}
-
 criterion_group! {
     name = event_cache;
-    config = criterion();
+    config = Criterion::default();
     targets = writing, reading,
 }
 
diff --git a/benchmarks/benches/room_bench.rs b/benchmarks/benches/room_bench.rs
index 5f130e40b..43443875d 100644
--- a/benchmarks/benches/room_bench.rs
+++ b/benchmarks/benches/room_bench.rs
@@ -208,13 +208,9 @@ pub fn load_pinned_events_benchmark(c: &mut Criterion) {
     group.finish();
 }
 
-fn criterion() -> Criterion {
-    Criterion::default()
-}
-
 criterion_group! {
     name = room;
-    config = criterion();
+    config = Criterion::default();
     targets = receive_all_members_benchmark, load_pinned_events_benchmark,
 }
 criterion_main!(room);
diff --git a/benchmarks/benches/store_bench.rs b/benchmarks/benches/store_bench.rs
index 7ab49d40d..2027a8218 100644
--- a/benchmarks/benches/store_bench.rs
+++ b/benchmarks/benches/store_bench.rs
@@ -10,12 +10,6 @@ use matrix_sdk_sqlite::SqliteStateStore;
 use ruma::{RoomId, device_id, user_id};
 use tokio::runtime::Builder;
 
-fn criterion() -> Criterion {
-    let criterion = Criterion::default();
-
-    criterion
-}
-
 /// Number of joined rooms in the benchmark.
 const NUM_JOINED_ROOMS: usize = 10000;
 
@@ -117,7 +111,7 @@ pub fn restore_session(c: &mut Criterion) {
 
 criterion_group! {
     name = benches;
-    config = criterion();
+    config = Criterion::default();
     targets = restore_session
 }
 criterion_main!(benches);
diff --git a/benchmarks/benches/timeline.rs b/benchmarks/benches/timeline.rs
index 3a0e32936..4837b0010 100644
--- a/benchmarks/benches/timeline.rs
+++ b/benchmarks/benches/timeline.rs
@@ -117,13 +117,9 @@ pub fn create_timeline_with_initial_events(c: &mut Criterion) {
     group.finish();
 }
 
-fn criterion() -> Criterion {
-    Criterion::default()
-}
-
 criterion_group! {
     name = room;
-    config = criterion();
+    config = Criterion::default();
     targets = create_timeline_with_initial_events
 }
 criterion_main!(room);