Skip to content

Commit d425502

Browse files
committed
Merge commit 'dbb25f2e07bc339a577a78ea5eff872bafc33b4c' into sync-2024-11-03
2 parents bd56a76 + dbb25f2 commit d425502

File tree

549 files changed

+17352
-8140
lines changed

Some content is hidden

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

549 files changed

+17352
-8140
lines changed

library/Cargo.lock

Lines changed: 50 additions & 40 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

library/alloc/benches/binary_heap.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use std::collections::BinaryHeap;
22

33
use rand::seq::SliceRandom;
4-
use test::{black_box, Bencher};
4+
use test::{Bencher, black_box};
55

66
#[bench]
77
fn bench_find_smallest_1000(b: &mut Bencher) {

library/alloc/benches/btree/map.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
use std::collections::BTreeMap;
22
use std::ops::RangeBounds;
33

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

88
macro_rules! map_insert_rand_bench {
99
($name: ident, $n: expr, $map: ident) => {

library/alloc/benches/lib.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
#![feature(iter_next_chunk)]
55
#![feature(repr_simd)]
66
#![feature(slice_partition_dedup)]
7-
#![feature(strict_provenance)]
7+
#![cfg_attr(bootstrap, feature(strict_provenance))]
8+
#![cfg_attr(not(bootstrap), feature(strict_provenance_lints))]
89
#![feature(test)]
910
#![deny(fuzzy_provenance_casts)]
1011

library/alloc/benches/slice.rs

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

3-
use rand::distributions::{Alphanumeric, DistString, Standard};
43
use rand::Rng;
5-
use test::{black_box, Bencher};
4+
use rand::distributions::{Alphanumeric, DistString, Standard};
5+
use test::{Bencher, black_box};
66

77
#[bench]
88
fn iterator(b: &mut Bencher) {
@@ -336,10 +336,10 @@ reverse!(reverse_u32, u32, |x| x as u32);
336336
reverse!(reverse_u64, u64, |x| x as u64);
337337
reverse!(reverse_u128, u128, |x| x as u128);
338338
#[repr(simd)]
339-
struct F64x4(f64, f64, f64, f64);
339+
struct F64x4([f64; 4]);
340340
reverse!(reverse_simd_f64x4, F64x4, |x| {
341341
let x = x as f64;
342-
F64x4(x, x, x, x)
342+
F64x4([x, x, x, x])
343343
});
344344

345345
macro_rules! rotate {

library/alloc/benches/str.rs

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

33
#[bench]
44
fn char_iterator(b: &mut Bencher) {
@@ -347,3 +347,5 @@ make_test!(rsplitn_space_char, s, s.rsplitn(10, ' ').count());
347347

348348
make_test!(split_space_str, s, s.split(" ").count());
349349
make_test!(split_ad_str, s, s.split("ad").count());
350+
351+
make_test!(to_lowercase, s, s.to_lowercase());

library/alloc/benches/string.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use std::iter::repeat;
22

3-
use test::{black_box, Bencher};
3+
use test::{Bencher, black_box};
44

55
#[bench]
66
fn bench_with_capacity(b: &mut Bencher) {

library/alloc/benches/vec.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use std::iter::repeat;
22

33
use rand::RngCore;
4-
use test::{black_box, Bencher};
4+
use test::{Bencher, black_box};
55

66
#[bench]
77
fn bench_new(b: &mut Bencher) {

library/alloc/benches/vec_deque.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
use std::collections::{vec_deque, VecDeque};
1+
use std::collections::{VecDeque, vec_deque};
22
use std::mem;
33

4-
use test::{black_box, Bencher};
4+
use test::{Bencher, black_box};
55

66
#[bench]
77
fn bench_new(b: &mut Bencher) {

0 commit comments

Comments
 (0)