Skip to content

Commit 67fa7b7

Browse files
authored
Rollup merge of #76400 - pickfire:patch-5, r=dtolnay
Clean up vec benches bench_in_place style
2 parents bac2f39 + 685f042 commit 67fa7b7

File tree

1 file changed

+21
-22
lines changed

1 file changed

+21
-22
lines changed

library/alloc/benches/vec.rs

+21-22
Original file line numberDiff line numberDiff line change
@@ -457,17 +457,16 @@ fn bench_clone_from_10_1000_0100(b: &mut Bencher) {
457457
}
458458

459459
macro_rules! bench_in_place {
460-
(
461-
$($fname:ident, $type:ty , $count:expr, $init: expr);*
462-
) => {
460+
($($fname:ident, $type:ty, $count:expr, $init:expr);*) => {
463461
$(
464462
#[bench]
465463
fn $fname(b: &mut Bencher) {
466464
b.iter(|| {
467465
let src: Vec<$type> = black_box(vec![$init; $count]);
468466
let mut sink = src.into_iter()
469467
.enumerate()
470-
.map(|(idx, e)| { (idx as $type) ^ e }).collect::<Vec<$type>>();
468+
.map(|(idx, e)| idx as $type ^ e)
469+
.collect::<Vec<$type>>();
471470
black_box(sink.as_mut_ptr())
472471
});
473472
}
@@ -476,24 +475,24 @@ macro_rules! bench_in_place {
476475
}
477476

478477
bench_in_place![
479-
bench_in_place_xxu8_i0_0010, u8, 10, 0;
480-
bench_in_place_xxu8_i0_0100, u8, 100, 0;
481-
bench_in_place_xxu8_i0_1000, u8, 1000, 0;
482-
bench_in_place_xxu8_i1_0010, u8, 10, 1;
483-
bench_in_place_xxu8_i1_0100, u8, 100, 1;
484-
bench_in_place_xxu8_i1_1000, u8, 1000, 1;
485-
bench_in_place_xu32_i0_0010, u32, 10, 0;
486-
bench_in_place_xu32_i0_0100, u32, 100, 0;
487-
bench_in_place_xu32_i0_1000, u32, 1000, 0;
488-
bench_in_place_xu32_i1_0010, u32, 10, 1;
489-
bench_in_place_xu32_i1_0100, u32, 100, 1;
490-
bench_in_place_xu32_i1_1000, u32, 1000, 1;
491-
bench_in_place_u128_i0_0010, u128, 10, 0;
492-
bench_in_place_u128_i0_0100, u128, 100, 0;
493-
bench_in_place_u128_i0_1000, u128, 1000, 0;
494-
bench_in_place_u128_i1_0010, u128, 10, 1;
495-
bench_in_place_u128_i1_0100, u128, 100, 1;
496-
bench_in_place_u128_i1_1000, u128, 1000, 1
478+
bench_in_place_xxu8_0010_i0, u8, 10, 0;
479+
bench_in_place_xxu8_0100_i0, u8, 100, 0;
480+
bench_in_place_xxu8_1000_i0, u8, 1000, 0;
481+
bench_in_place_xxu8_0010_i1, u8, 10, 1;
482+
bench_in_place_xxu8_0100_i1, u8, 100, 1;
483+
bench_in_place_xxu8_1000_i1, u8, 1000, 1;
484+
bench_in_place_xu32_0010_i0, u32, 10, 0;
485+
bench_in_place_xu32_0100_i0, u32, 100, 0;
486+
bench_in_place_xu32_1000_i0, u32, 1000, 0;
487+
bench_in_place_xu32_0010_i1, u32, 10, 1;
488+
bench_in_place_xu32_0100_i1, u32, 100, 1;
489+
bench_in_place_xu32_1000_i1, u32, 1000, 1;
490+
bench_in_place_u128_0010_i0, u128, 10, 0;
491+
bench_in_place_u128_0100_i0, u128, 100, 0;
492+
bench_in_place_u128_1000_i0, u128, 1000, 0;
493+
bench_in_place_u128_0010_i1, u128, 10, 1;
494+
bench_in_place_u128_0100_i1, u128, 100, 1;
495+
bench_in_place_u128_1000_i1, u128, 1000, 1
497496
];
498497

499498
#[bench]

0 commit comments

Comments
 (0)