Skip to content

Commit 4007d4e

Browse files
borsbors
committed
Auto merge of rust-lang#66917 - Centril:rollup-xj2enik, r=Centril
Rollup of 9 pull requests Successful merges: - rust-lang#66503 (More useful test error messages on should_panic(expected=...) mismatch) - rust-lang#66662 (Miri: run panic-catching tests in liballoc) - rust-lang#66679 (Improve lifetime errors with implicit trait object lifetimes) - rust-lang#66726 (Use recursion_limit for const eval stack limit) - rust-lang#66790 (Do `min_const_fn` checks for `SetDiscriminant`s target) - rust-lang#66832 (const_prop: detect and avoid catching Miri errors that require allocation) - rust-lang#66880 (Add long error code explanation message for E0203) - rust-lang#66890 (Format liballoc with rustfmt) - rust-lang#66896 (pass Queries to compiler callbacks) Failed merges: r? @ghost
2 parents 135ccba + bed4c09 commit 4007d4e

Some content is hidden

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

47 files changed

+657
-631
lines changed

‎src/liballoc/alloc/tests.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
use super::*;
22

33
extern crate test;
4-
use test::Bencher;
54
use crate::boxed::Box;
5+
use test::Bencher;
66

77
#[test]
88
fn allocate_zeroed() {
99
unsafe {
1010
let layout = Layout::from_size_align(1024, 1).unwrap();
11-
let ptr = Global.alloc_zeroed(layout.clone())
12-
.unwrap_or_else(|_| handle_alloc_error(layout));
11+
let ptr =
12+
Global.alloc_zeroed(layout.clone()).unwrap_or_else(|_| handle_alloc_error(layout));
1313

1414
let mut i = ptr.cast::<u8>().as_ptr();
1515
let end = i.add(layout.size());

‎src/liballoc/benches/btree/map.rs‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1+
use std::collections::BTreeMap;
12
use std::iter::Iterator;
23
use std::vec::Vec;
3-
use std::collections::BTreeMap;
44

5-
use rand::{Rng, seq::SliceRandom, thread_rng};
6-
use test::{Bencher, black_box};
5+
use rand::{seq::SliceRandom, thread_rng, Rng};
6+
use test::{black_box, Bencher};
77

88
macro_rules! map_insert_rand_bench {
9-
($name: ident, $n: expr, $map: ident) => (
9+
($name: ident, $n: expr, $map: ident) => {
1010
#[bench]
1111
pub fn $name(b: &mut Bencher) {
1212
let n: usize = $n;
@@ -27,11 +27,11 @@ macro_rules! map_insert_rand_bench {
2727
});
2828
black_box(map);
2929
}
30-
)
30+
};
3131
}
3232

3333
macro_rules! map_insert_seq_bench {
34-
($name: ident, $n: expr, $map: ident) => (
34+
($name: ident, $n: expr, $map: ident) => {
3535
#[bench]
3636
pub fn $name(b: &mut Bencher) {
3737
let mut map = $map::new();
@@ -50,11 +50,11 @@ macro_rules! map_insert_seq_bench {
5050
});
5151
black_box(map);
5252
}
53-
)
53+
};
5454
}
5555

5656
macro_rules! map_find_rand_bench {
57-
($name: ident, $n: expr, $map: ident) => (
57+
($name: ident, $n: expr, $map: ident) => {
5858
#[bench]
5959
pub fn $name(b: &mut Bencher) {
6060
let mut map = $map::new();
@@ -78,11 +78,11 @@ macro_rules! map_find_rand_bench {
7878
black_box(t);
7979
})
8080
}
81-
)
81+
};
8282
}
8383

8484
macro_rules! map_find_seq_bench {
85-
($name: ident, $n: expr, $map: ident) => (
85+
($name: ident, $n: expr, $map: ident) => {
8686
#[bench]
8787
pub fn $name(b: &mut Bencher) {
8888
let mut map = $map::new();
@@ -101,20 +101,20 @@ macro_rules! map_find_seq_bench {
101101
black_box(x);
102102
})
103103
}
104-
)
104+
};
105105
}
106106

107-
map_insert_rand_bench!{insert_rand_100, 100, BTreeMap}
108-
map_insert_rand_bench!{insert_rand_10_000, 10_000, BTreeMap}
107+
map_insert_rand_bench! {insert_rand_100, 100, BTreeMap}
108+
map_insert_rand_bench! {insert_rand_10_000, 10_000, BTreeMap}
109109

110-
map_insert_seq_bench!{insert_seq_100, 100, BTreeMap}
111-
map_insert_seq_bench!{insert_seq_10_000, 10_000, BTreeMap}
110+
map_insert_seq_bench! {insert_seq_100, 100, BTreeMap}
111+
map_insert_seq_bench! {insert_seq_10_000, 10_000, BTreeMap}
112112

113-
map_find_rand_bench!{find_rand_100, 100, BTreeMap}
114-
map_find_rand_bench!{find_rand_10_000, 10_000, BTreeMap}
113+
map_find_rand_bench! {find_rand_100, 100, BTreeMap}
114+
map_find_rand_bench! {find_rand_10_000, 10_000, BTreeMap}
115115

116-
map_find_seq_bench!{find_seq_100, 100, BTreeMap}
117-
map_find_seq_bench!{find_seq_10_000, 10_000, BTreeMap}
116+
map_find_seq_bench! {find_seq_100, 100, BTreeMap}
117+
map_find_seq_bench! {find_seq_10_000, 10_000, BTreeMap}
118118

119119
fn bench_iter(b: &mut Bencher, size: i32) {
120120
let mut map = BTreeMap::<i32, i32>::new();

‎src/liballoc/benches/slice.rs‎

Lines changed: 32 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
use std::{mem, ptr};
22

3+
use rand::distributions::{Alphanumeric, Standard};
34
use rand::{thread_rng, Rng, SeedableRng};
4-
use rand::distributions::{Standard, Alphanumeric};
55
use rand_xorshift::XorShiftRng;
6-
use test::{Bencher, black_box};
6+
use test::{black_box, Bencher};
77

88
#[bench]
99
fn iterator(b: &mut Bencher) {
@@ -239,7 +239,7 @@ macro_rules! sort {
239239
b.iter(|| v.clone().$f());
240240
b.bytes = $len * mem::size_of_val(&$gen(1)[0]) as u64;
241241
}
242-
}
242+
};
243243
}
244244

245245
macro_rules! sort_strings {
@@ -251,7 +251,7 @@ macro_rules! sort_strings {
251251
b.iter(|| v.clone().$f());
252252
b.bytes = $len * mem::size_of::<&str>() as u64;
253253
}
254-
}
254+
};
255255
}
256256

257257
macro_rules! sort_expensive {
@@ -273,7 +273,7 @@ macro_rules! sort_expensive {
273273
});
274274
b.bytes = $len * mem::size_of_val(&$gen(1)[0]) as u64;
275275
}
276-
}
276+
};
277277
}
278278

279279
macro_rules! sort_lexicographic {
@@ -284,7 +284,7 @@ macro_rules! sort_lexicographic {
284284
b.iter(|| v.clone().$f(|x| x.to_string()));
285285
b.bytes = $len * mem::size_of_val(&$gen(1)[0]) as u64;
286286
}
287-
}
287+
};
288288
}
289289

290290
sort!(sort, sort_small_ascending, gen_ascending, 10);
@@ -325,57 +325,58 @@ macro_rules! reverse {
325325
fn $name(b: &mut Bencher) {
326326
// odd length and offset by 1 to be as unaligned as possible
327327
let n = 0xFFFFF;
328-
let mut v: Vec<_> =
329-
(0..1+(n / mem::size_of::<$ty>() as u64))
330-
.map($f)
331-
.collect();
328+
let mut v: Vec<_> = (0..1 + (n / mem::size_of::<$ty>() as u64)).map($f).collect();
332329
b.iter(|| black_box(&mut v[1..]).reverse());
333330
b.bytes = n;
334331
}
335-
}
332+
};
336333
}
337334

338335
reverse!(reverse_u8, u8, |x| x as u8);
339336
reverse!(reverse_u16, u16, |x| x as u16);
340-
reverse!(reverse_u8x3, [u8;3], |x| [x as u8, (x>>8) as u8, (x>>16) as u8]);
337+
reverse!(reverse_u8x3, [u8; 3], |x| [x as u8, (x >> 8) as u8, (x >> 16) as u8]);
341338
reverse!(reverse_u32, u32, |x| x as u32);
342339
reverse!(reverse_u64, u64, |x| x as u64);
343340
reverse!(reverse_u128, u128, |x| x as u128);
344-
#[repr(simd)] struct F64x4(f64, f64, f64, f64);
345-
reverse!(reverse_simd_f64x4, F64x4, |x| { let x = x as f64; F64x4(x,x,x,x) });
341+
#[repr(simd)]
342+
struct F64x4(f64, f64, f64, f64);
343+
reverse!(reverse_simd_f64x4, F64x4, |x| {
344+
let x = x as f64;
345+
F64x4(x, x, x, x)
346+
});
346347

347348
macro_rules! rotate {
348349
($name:ident, $gen:expr, $len:expr, $mid:expr) => {
349350
#[bench]
350351
fn $name(b: &mut Bencher) {
351352
let size = mem::size_of_val(&$gen(1)[0]);
352353
let mut v = $gen($len * 8 / size);
353-
b.iter(|| black_box(&mut v).rotate_left(($mid*8+size-1)/size));
354+
b.iter(|| black_box(&mut v).rotate_left(($mid * 8 + size - 1) / size));
354355
b.bytes = (v.len() * size) as u64;
355356
}
356-
}
357+
};
357358
}
358359

359360
rotate!(rotate_tiny_by1, gen_random, 16, 1);
360-
rotate!(rotate_tiny_half, gen_random, 16, 16/2);
361-
rotate!(rotate_tiny_half_plus_one, gen_random, 16, 16/2+1);
361+
rotate!(rotate_tiny_half, gen_random, 16, 16 / 2);
362+
rotate!(rotate_tiny_half_plus_one, gen_random, 16, 16 / 2 + 1);
362363

363364
rotate!(rotate_medium_by1, gen_random, 9158, 1);
364365
rotate!(rotate_medium_by727_u64, gen_random, 9158, 727);
365366
rotate!(rotate_medium_by727_bytes, gen_random_bytes, 9158, 727);
366367
rotate!(rotate_medium_by727_strings, gen_strings, 9158, 727);
367-
rotate!(rotate_medium_half, gen_random, 9158, 9158/2);
368-
rotate!(rotate_medium_half_plus_one, gen_random, 9158, 9158/2+1);
368+
rotate!(rotate_medium_half, gen_random, 9158, 9158 / 2);
369+
rotate!(rotate_medium_half_plus_one, gen_random, 9158, 9158 / 2 + 1);
369370

370371
// Intended to use more RAM than the machine has cache
371-
rotate!(rotate_huge_by1, gen_random, 5*1024*1024, 1);
372-
rotate!(rotate_huge_by9199_u64, gen_random, 5*1024*1024, 9199);
373-
rotate!(rotate_huge_by9199_bytes, gen_random_bytes, 5*1024*1024, 9199);
374-
rotate!(rotate_huge_by9199_strings, gen_strings, 5*1024*1024, 9199);
375-
rotate!(rotate_huge_by9199_big, gen_big_random, 5*1024*1024, 9199);
376-
rotate!(rotate_huge_by1234577_u64, gen_random, 5*1024*1024, 1234577);
377-
rotate!(rotate_huge_by1234577_bytes, gen_random_bytes, 5*1024*1024, 1234577);
378-
rotate!(rotate_huge_by1234577_strings, gen_strings, 5*1024*1024, 1234577);
379-
rotate!(rotate_huge_by1234577_big, gen_big_random, 5*1024*1024, 1234577);
380-
rotate!(rotate_huge_half, gen_random, 5*1024*1024, 5*1024*1024/2);
381-
rotate!(rotate_huge_half_plus_one, gen_random, 5*1024*1024, 5*1024*1024/2+1);
372+
rotate!(rotate_huge_by1, gen_random, 5 * 1024 * 1024, 1);
373+
rotate!(rotate_huge_by9199_u64, gen_random, 5 * 1024 * 1024, 9199);
374+
rotate!(rotate_huge_by9199_bytes, gen_random_bytes, 5 * 1024 * 1024, 9199);
375+
rotate!(rotate_huge_by9199_strings, gen_strings, 5 * 1024 * 1024, 9199);
376+
rotate!(rotate_huge_by9199_big, gen_big_random, 5 * 1024 * 1024, 9199);
377+
rotate!(rotate_huge_by1234577_u64, gen_random, 5 * 1024 * 1024, 1234577);
378+
rotate!(rotate_huge_by1234577_bytes, gen_random_bytes, 5 * 1024 * 1024, 1234577);
379+
rotate!(rotate_huge_by1234577_strings, gen_strings, 5 * 1024 * 1024, 1234577);
380+
rotate!(rotate_huge_by1234577_big, gen_big_random, 5 * 1024 * 1024, 1234577);
381+
rotate!(rotate_huge_half, gen_random, 5 * 1024 * 1024, 5 * 1024 * 1024 / 2);
382+
rotate!(rotate_huge_half_plus_one, gen_random, 5 * 1024 * 1024, 5 * 1024 * 1024 / 2 + 1);

‎src/liballoc/benches/str.rs‎

Lines changed: 19 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use test::{Bencher, black_box};
1+
use test::{black_box, Bencher};
22

33
#[bench]
44
fn char_iterator(b: &mut Bencher) {
@@ -12,7 +12,9 @@ fn char_iterator_for(b: &mut Bencher) {
1212
let s = "ศไทย中华Việt Nam; Mary had a little lamb, Little lamb";
1313

1414
b.iter(|| {
15-
for ch in s.chars() { black_box(ch); }
15+
for ch in s.chars() {
16+
black_box(ch);
17+
}
1618
});
1719
}
1820

@@ -40,7 +42,9 @@ fn char_iterator_rev_for(b: &mut Bencher) {
4042
let s = "ศไทย中华Việt Nam; Mary had a little lamb, Little lamb";
4143

4244
b.iter(|| {
43-
for ch in s.chars().rev() { black_box(ch); }
45+
for ch in s.chars().rev() {
46+
black_box(ch);
47+
}
4448
});
4549
}
4650

@@ -79,7 +83,9 @@ fn split_ascii(b: &mut Bencher) {
7983
fn split_extern_fn(b: &mut Bencher) {
8084
let s = "Mary had a little lamb, Little lamb, little-lamb.";
8185
let len = s.split(' ').count();
82-
fn pred(c: char) -> bool { c == ' ' }
86+
fn pred(c: char) -> bool {
87+
c == ' '
88+
}
8389

8490
b.iter(|| assert_eq!(s.split(pred).count(), len));
8591
}
@@ -185,16 +191,19 @@ fn bench_contains_equal(b: &mut Bencher) {
185191
})
186192
}
187193

188-
189194
macro_rules! make_test_inner {
190195
($s:ident, $code:expr, $name:ident, $str:expr, $iters:expr) => {
191196
#[bench]
192197
fn $name(bencher: &mut Bencher) {
193198
let mut $s = $str;
194199
black_box(&mut $s);
195-
bencher.iter(|| for _ in 0..$iters { black_box($code); });
200+
bencher.iter(|| {
201+
for _ in 0..$iters {
202+
black_box($code);
203+
}
204+
});
196205
}
197-
}
206+
};
198207
}
199208

200209
macro_rules! make_test {
@@ -261,15 +270,9 @@ make_test!(match_indices_a_str, s, s.match_indices("a").count());
261270

262271
make_test!(split_a_str, s, s.split("a").count());
263272

264-
make_test!(trim_ascii_char, s, {
265-
s.trim_matches(|c: char| c.is_ascii())
266-
});
267-
make_test!(trim_start_ascii_char, s, {
268-
s.trim_start_matches(|c: char| c.is_ascii())
269-
});
270-
make_test!(trim_end_ascii_char, s, {
271-
s.trim_end_matches(|c: char| c.is_ascii())
272-
});
273+
make_test!(trim_ascii_char, s, { s.trim_matches(|c: char| c.is_ascii()) });
274+
make_test!(trim_start_ascii_char, s, { s.trim_start_matches(|c: char| c.is_ascii()) });
275+
make_test!(trim_end_ascii_char, s, { s.trim_end_matches(|c: char| c.is_ascii()) });
273276

274277
make_test!(find_underscore_char, s, s.find('_'));
275278
make_test!(rfind_underscore_char, s, s.rfind('_'));

‎src/liballoc/benches/vec_deque.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
use std::collections::VecDeque;
2-
use test::{Bencher, black_box};
2+
use test::{black_box, Bencher};
33

44
#[bench]
55
fn bench_new(b: &mut Bencher) {

‎src/liballoc/benches/vec_deque_append.rs‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,5 @@ fn main() {
3030

3131
assert!(BENCH_N % 2 == 0);
3232
let median = (durations[(l / 2) - 1] + durations[l / 2]) / 2;
33-
println!(
34-
"\ncustom-bench vec_deque_append {:?} ns/iter\n",
35-
median.as_nanos()
36-
);
33+
println!("\ncustom-bench vec_deque_append {:?} ns/iter\n", median.as_nanos());
3734
}

‎src/liballoc/collections/btree/mod.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1+
pub mod map;
12
mod node;
23
mod search;
3-
pub mod map;
44
pub mod set;
55

66
#[doc(hidden)]

0 commit comments

Comments
 (0)