Skip to content

Commit d40f04e

Browse files
committed
chore: Remove the criterion function in the benchmarks
It's now equivalent to Criterion::default().
1 parent d8294a0 commit d40f04e

File tree

6 files changed

+7
-39
lines changed

6 files changed

+7
-39
lines changed

benchmarks/benches/crypto_bench.rs

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -285,23 +285,17 @@ pub fn devices_missing_sessions_collecting(c: &mut Criterion) {
285285
group.finish()
286286
}
287287

288-
fn criterion() -> Criterion {
289-
let criterion = Criterion::default();
290-
291-
criterion
292-
}
293-
294288
#[cfg(not(feature = "codspeed"))]
295289
criterion_group! {
296290
name = benches;
297-
config = criterion();
291+
config = Criterion::default();
298292
targets = keys_query, keys_claiming, room_key_sharing, devices_missing_sessions_collecting,
299293
}
300294

301295
#[cfg(feature = "codspeed")]
302296
criterion_group! {
303297
name = benches;
304-
config = criterion();
298+
config = Criterion::default();
305299
targets = keys_query, room_key_sharing, devices_missing_sessions_collecting,
306300
}
307301

benchmarks/benches/event_cache.rs

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -133,15 +133,9 @@ fn handle_room_updates(c: &mut Criterion) {
133133
group.finish()
134134
}
135135

136-
fn criterion() -> Criterion {
137-
let criterion = Criterion::default();
138-
139-
criterion
140-
}
141-
142136
criterion_group! {
143137
name = event_cache;
144-
config = criterion();
138+
config = Criterion::default();
145139
targets = handle_room_updates,
146140
}
147141

benchmarks/benches/linked_chunk.rs

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -260,15 +260,9 @@ fn reading(c: &mut Criterion) {
260260
group.finish()
261261
}
262262

263-
fn criterion() -> Criterion {
264-
let criterion = Criterion::default();
265-
266-
criterion
267-
}
268-
269263
criterion_group! {
270264
name = event_cache;
271-
config = criterion();
265+
config = Criterion::default();
272266
targets = writing, reading,
273267
}
274268

benchmarks/benches/room_bench.rs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -208,13 +208,9 @@ pub fn load_pinned_events_benchmark(c: &mut Criterion) {
208208
group.finish();
209209
}
210210

211-
fn criterion() -> Criterion {
212-
Criterion::default()
213-
}
214-
215211
criterion_group! {
216212
name = room;
217-
config = criterion();
213+
config = Criterion::default();
218214
targets = receive_all_members_benchmark, load_pinned_events_benchmark,
219215
}
220216
criterion_main!(room);

benchmarks/benches/store_bench.rs

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,6 @@ use matrix_sdk_sqlite::SqliteStateStore;
1010
use ruma::{RoomId, device_id, user_id};
1111
use tokio::runtime::Builder;
1212

13-
fn criterion() -> Criterion {
14-
let criterion = Criterion::default();
15-
16-
criterion
17-
}
18-
1913
/// Number of joined rooms in the benchmark.
2014
const NUM_JOINED_ROOMS: usize = 10000;
2115

@@ -117,7 +111,7 @@ pub fn restore_session(c: &mut Criterion) {
117111

118112
criterion_group! {
119113
name = benches;
120-
config = criterion();
114+
config = Criterion::default();
121115
targets = restore_session
122116
}
123117
criterion_main!(benches);

benchmarks/benches/timeline.rs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -117,13 +117,9 @@ pub fn create_timeline_with_initial_events(c: &mut Criterion) {
117117
group.finish();
118118
}
119119

120-
fn criterion() -> Criterion {
121-
Criterion::default()
122-
}
123-
124120
criterion_group! {
125121
name = room;
126-
config = criterion();
122+
config = Criterion::default();
127123
targets = create_timeline_with_initial_events
128124
}
129125
criterion_main!(room);

0 commit comments

Comments
 (0)