Skip to content

Commit b79f040

Browse files
chore: bump repo toolchain to 1.96
1 parent c42d392 commit b79f040

9 files changed

Lines changed: 11 additions & 10 deletions

File tree

crates/criterion_compat/benches/criterion_integration/with_inputs.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ fn from_elem(c: &mut Criterion) {
99
for size in [KB, 2 * KB, 4 * KB, 8 * KB, 16 * KB].iter() {
1010
group.throughput(Throughput::Bytes(*size as u64));
1111
group.bench_with_input(BenchmarkId::from_parameter(size), size, |b, &size| {
12-
b.iter(|| iter::repeat(0u8).take(size).collect::<Vec<_>>());
12+
b.iter(|| iter::repeat_n(0u8, size).collect::<Vec<_>>());
1313
});
1414
}
1515
group.finish();
@@ -18,7 +18,7 @@ fn from_elem(c: &mut Criterion) {
1818
for size in [KB, 2 * KB].iter() {
1919
group.throughput(Throughput::BytesDecimal(*size as u64));
2020
group.bench_with_input(BenchmarkId::from_parameter(size), size, |b, &size| {
21-
b.iter(|| iter::repeat(0u8).take(size).collect::<Vec<_>>());
21+
b.iter(|| iter::repeat_n(0u8, size).collect::<Vec<_>>());
2222
});
2323
}
2424
group.finish();

crates/criterion_compat/criterion_fork/src/plot/gnuplot_backend/summary.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ pub fn line_comparison(
9494
(x, y)
9595
})
9696
.collect();
97-
tuples.sort_by(|&(ax, _), &(bx, _)| (ax.partial_cmp(&bx).unwrap_or(Ordering::Less)));
97+
tuples.sort_by(|&(ax, _), &(bx, _)| ax.partial_cmp(&bx).unwrap_or(Ordering::Less));
9898
let (xs, mut ys): (Vec<_>, Vec<_>) = tuples.into_iter().unzip();
9999
formatter.scale_values(max, &mut ys);
100100

crates/criterion_compat/criterion_fork/src/plot/plotters_backend/summary.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ fn line_comparison_series_data<'a>(
142142
(x, y)
143143
})
144144
.collect();
145-
tuples.sort_by(|&(ax, _), &(bx, _)| (ax.partial_cmp(&bx).unwrap_or(Ordering::Less)));
145+
tuples.sort_by(|&(ax, _), &(bx, _)| ax.partial_cmp(&bx).unwrap_or(Ordering::Less));
146146
let function_name = key.as_ref();
147147
let (xs, mut ys): (Vec<_>, Vec<_>) = tuples.into_iter().unzip();
148148
formatter.scale_values(max, &mut ys);

crates/criterion_compat/src/compat/criterion.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ impl<M: Measurement> Criterion<M> {
121121
}
122122

123123
#[track_caller]
124-
pub fn benchmark_group<S: Into<String>>(&mut self, group_name: S) -> BenchmarkGroup<M> {
124+
pub fn benchmark_group<S: Into<String>>(&mut self, group_name: S) -> BenchmarkGroup<'_, M> {
125125
self.ensure_current_file();
126126
BenchmarkGroup::<M>::new(self, group_name.into())
127127
}

crates/divan_compat/divan_fork/src/counter/any_counter.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ impl AnyCounter {
6565
&self,
6666
duration: FineDuration,
6767
bytes_format: BytesFormat,
68-
) -> DisplayThroughput {
68+
) -> DisplayThroughput<'_> {
6969
DisplayThroughput { counter: self, picos: duration.picos as f64, bytes_format }
7070
}
7171

crates/divan_compat/divan_fork/src/entry/meta.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ pub struct EntryLocation {
3333

3434
impl EntryMeta {
3535
#[inline]
36-
pub(crate) fn bench_options(&self) -> Option<&BenchOptions> {
36+
pub(crate) fn bench_options(&self) -> Option<&BenchOptions<'_>> {
3737
self.bench_options.as_deref()
3838
}
3939

crates/divan_compat/divan_fork/src/entry/tree.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -335,7 +335,7 @@ impl<'a> EntryTree<'a> {
335335
}
336336
}
337337

338-
pub fn bench_options(&self) -> Option<&'a BenchOptions> {
338+
pub fn bench_options(&self) -> Option<&'a BenchOptions<'_>> {
339339
self.meta()?.bench_options()
340340
}
341341

crates/divan_compat/divan_fork/tests/weird_usage.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
use std::time::Duration;
77

88
extern crate codspeed_divan_compat_walltime as divan;
9-
use divan::{Divan, __private::BENCH_ENTRIES};
9+
use divan::{__private::BENCH_ENTRIES, Divan};
1010

1111
#[divan::bench(bytes_count = 0u8, chars_count = 0u16, cycles_count = 0u32, items_count = 0u64)]
1212
fn zero_throughput() {}

rust-toolchain.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
[toolchain]
2-
channel = "1.88"
2+
channel = "1.96"
3+
components = ["rustfmt", "clippy", "rust-analyzer"]

0 commit comments

Comments
 (0)