Skip to content

Commit dfca153

Browse files
committedMar 7, 2025
Auto merge of rust-lang#138155 - matthiaskrgr:rollup-xq5buio, r=matthiaskrgr
Rollup of 6 pull requests Successful merges: - rust-lang#137674 (Enable `f16` for LoongArch) - rust-lang#138034 (library: Use `size_of` from the prelude instead of imported) - rust-lang#138060 (Revert rust-lang#138019 after further discussion about how hir-pretty printing should work) - rust-lang#138073 (Break critical edges in inline asm before code generation) - rust-lang#138107 (`librustdoc`: clippy fixes) - rust-lang#138111 (Use `default_field_values` for `rustc_errors::Context`, `rustc_session::config::NextSolverConfig` and `rustc_session::config::ErrorOutputType`) r? `@ghost` `@rustbot` modify labels: rollup
2 parents b68bc98 + b615fd5 commit dfca153

File tree

119 files changed

+402
-497
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

119 files changed

+402
-497
lines changed
 

‎alloc/benches/slice.rs

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use std::{mem, ptr};
1+
use std::ptr;
22

33
use rand::Rng;
44
use rand::distr::{Alphanumeric, SampleString, StandardUniform};
@@ -234,7 +234,7 @@ macro_rules! sort {
234234
fn $name(b: &mut Bencher) {
235235
let v = $gen($len);
236236
b.iter(|| v.clone().$f());
237-
b.bytes = $len * mem::size_of_val(&$gen(1)[0]) as u64;
237+
b.bytes = $len * size_of_val(&$gen(1)[0]) as u64;
238238
}
239239
};
240240
}
@@ -246,7 +246,7 @@ macro_rules! sort_strings {
246246
let v = $gen($len);
247247
let v = v.iter().map(|s| &**s).collect::<Vec<&str>>();
248248
b.iter(|| v.clone().$f());
249-
b.bytes = $len * mem::size_of::<&str>() as u64;
249+
b.bytes = $len * size_of::<&str>() as u64;
250250
}
251251
};
252252
}
@@ -268,7 +268,7 @@ macro_rules! sort_expensive {
268268
});
269269
black_box(count);
270270
});
271-
b.bytes = $len * mem::size_of_val(&$gen(1)[0]) as u64;
271+
b.bytes = $len * size_of_val(&$gen(1)[0]) as u64;
272272
}
273273
};
274274
}
@@ -279,7 +279,7 @@ macro_rules! sort_lexicographic {
279279
fn $name(b: &mut Bencher) {
280280
let v = $gen($len);
281281
b.iter(|| v.clone().$f(|x| x.to_string()));
282-
b.bytes = $len * mem::size_of_val(&$gen(1)[0]) as u64;
282+
b.bytes = $len * size_of_val(&$gen(1)[0]) as u64;
283283
}
284284
};
285285
}
@@ -322,7 +322,7 @@ macro_rules! reverse {
322322
fn $name(b: &mut Bencher) {
323323
// odd length and offset by 1 to be as unaligned as possible
324324
let n = 0xFFFFF;
325-
let mut v: Vec<_> = (0..1 + (n / mem::size_of::<$ty>() as u64)).map($f).collect();
325+
let mut v: Vec<_> = (0..1 + (n / size_of::<$ty>() as u64)).map($f).collect();
326326
b.iter(|| black_box(&mut v[1..]).reverse());
327327
b.bytes = n;
328328
}
@@ -346,7 +346,7 @@ macro_rules! rotate {
346346
($name:ident, $gen:expr, $len:expr, $mid:expr) => {
347347
#[bench]
348348
fn $name(b: &mut Bencher) {
349-
let size = mem::size_of_val(&$gen(1)[0]);
349+
let size = size_of_val(&$gen(1)[0]);
350350
let mut v = $gen($len * 8 / size);
351351
b.iter(|| black_box(&mut v).rotate_left(($mid * 8 + size - 1) / size));
352352
b.bytes = (v.len() * size) as u64;

‎alloc/benches/vec.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -669,7 +669,7 @@ fn random_sorted_fill(mut seed: u32, buf: &mut [u32]) {
669669
// This algorithm was used for Vecs prior to Rust 1.52.
670670
fn bench_dedup_slice_truncate(b: &mut Bencher, sz: usize) {
671671
let mut template = vec![0u32; sz];
672-
b.bytes = std::mem::size_of_val(template.as_slice()) as u64;
672+
b.bytes = size_of_val(template.as_slice()) as u64;
673673
random_sorted_fill(0x43, &mut template);
674674

675675
let mut vec = template.clone();
@@ -691,7 +691,7 @@ fn bench_dedup_slice_truncate(b: &mut Bencher, sz: usize) {
691691
// Measures performance of Vec::dedup on random data.
692692
fn bench_vec_dedup_random(b: &mut Bencher, sz: usize) {
693693
let mut template = vec![0u32; sz];
694-
b.bytes = std::mem::size_of_val(template.as_slice()) as u64;
694+
b.bytes = size_of_val(template.as_slice()) as u64;
695695
random_sorted_fill(0x43, &mut template);
696696

697697
let mut vec = template.clone();
@@ -708,7 +708,7 @@ fn bench_vec_dedup_random(b: &mut Bencher, sz: usize) {
708708
// Measures performance of Vec::dedup when there is no items removed
709709
fn bench_vec_dedup_none(b: &mut Bencher, sz: usize) {
710710
let mut template = vec![0u32; sz];
711-
b.bytes = std::mem::size_of_val(template.as_slice()) as u64;
711+
b.bytes = size_of_val(template.as_slice()) as u64;
712712
template.chunks_exact_mut(2).for_each(|w| {
713713
w[0] = black_box(0);
714714
w[1] = black_box(5);
@@ -729,7 +729,7 @@ fn bench_vec_dedup_none(b: &mut Bencher, sz: usize) {
729729
// Measures performance of Vec::dedup when there is all items removed
730730
fn bench_vec_dedup_all(b: &mut Bencher, sz: usize) {
731731
let mut template = vec![0u32; sz];
732-
b.bytes = std::mem::size_of_val(template.as_slice()) as u64;
732+
b.bytes = size_of_val(template.as_slice()) as u64;
733733
template.iter_mut().for_each(|w| {
734734
*w = black_box(0);
735735
});

0 commit comments

Comments
 (0)