Skip to content

Commit af7e90a

Browse files
committed
alloc: Apply keyword_idents_2024
1 parent 8a82798 commit af7e90a

File tree

5 files changed

+16
-16
lines changed

5 files changed

+16
-16
lines changed

library/alloc/benches/btree/map.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@ macro_rules! map_insert_rand_bench {
1515
let mut rng = crate::bench_rng();
1616

1717
for _ in 0..n {
18-
let i = rng.gen::<usize>() % n;
18+
let i = rng.r#gen::<usize>() % n;
1919
map.insert(i, i);
2020
}
2121

2222
// measure
2323
b.iter(|| {
24-
let k = rng.gen::<usize>() % n;
24+
let k = rng.r#gen::<usize>() % n;
2525
map.insert(k, k);
2626
map.remove(&k);
2727
});
@@ -63,7 +63,7 @@ macro_rules! map_from_iter_rand_bench {
6363
let mut vec = Vec::with_capacity(n);
6464

6565
for _ in 0..n {
66-
let i = rng.gen::<usize>() % n;
66+
let i = rng.r#gen::<usize>() % n;
6767
vec.push((i, i));
6868
}
6969

@@ -106,7 +106,7 @@ macro_rules! map_find_rand_bench {
106106

107107
// setup
108108
let mut rng = crate::bench_rng();
109-
let mut keys: Vec<_> = (0..n).map(|_| rng.gen::<usize>() % n).collect();
109+
let mut keys: Vec<_> = (0..n).map(|_| rng.r#gen::<usize>() % n).collect();
110110

111111
for &k in &keys {
112112
map.insert(k, k);
@@ -171,7 +171,7 @@ fn bench_iteration(b: &mut Bencher, size: i32) {
171171
let mut rng = crate::bench_rng();
172172

173173
for _ in 0..size {
174-
map.insert(rng.gen(), rng.gen());
174+
map.insert(rng.r#gen(), rng.r#gen());
175175
}
176176

177177
b.iter(|| {
@@ -201,7 +201,7 @@ fn bench_iteration_mut(b: &mut Bencher, size: i32) {
201201
let mut rng = crate::bench_rng();
202202

203203
for _ in 0..size {
204-
map.insert(rng.gen(), rng.gen());
204+
map.insert(rng.r#gen(), rng.r#gen());
205205
}
206206

207207
b.iter(|| {

library/alloc/benches/btree/set.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ fn random(n: usize) -> BTreeSet<usize> {
77
let mut rng = crate::bench_rng();
88
let mut set = BTreeSet::new();
99
while set.len() < n {
10-
set.insert(rng.gen());
10+
set.insert(rng.r#gen());
1111
}
1212
assert_eq!(set.len(), n);
1313
set

library/alloc/benches/slice.rs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ fn random_inserts(b: &mut Bencher) {
156156
let mut v = vec![(0, 0); 30];
157157
for _ in 0..100 {
158158
let l = v.len();
159-
v.insert(rng.gen::<usize>() % (l + 1), (1, 1));
159+
v.insert(rng.r#gen::<usize>() % (l + 1), (1, 1));
160160
}
161161
})
162162
}
@@ -168,7 +168,7 @@ fn random_removes(b: &mut Bencher) {
168168
let mut v = vec![(0, 0); 130];
169169
for _ in 0..100 {
170170
let l = v.len();
171-
v.remove(rng.gen::<usize>() % l);
171+
v.remove(rng.r#gen::<usize>() % l);
172172
}
173173
})
174174
}
@@ -195,8 +195,8 @@ fn gen_mostly_ascending(len: usize) -> Vec<u64> {
195195
let mut rng = crate::bench_rng();
196196
let mut v = gen_ascending(len);
197197
for _ in (0usize..).take_while(|x| x * x <= len) {
198-
let x = rng.gen::<usize>() % len;
199-
let y = rng.gen::<usize>() % len;
198+
let x = rng.r#gen::<usize>() % len;
199+
let y = rng.r#gen::<usize>() % len;
200200
v.swap(x, y);
201201
}
202202
v
@@ -206,8 +206,8 @@ fn gen_mostly_descending(len: usize) -> Vec<u64> {
206206
let mut rng = crate::bench_rng();
207207
let mut v = gen_descending(len);
208208
for _ in (0usize..).take_while(|x| x * x <= len) {
209-
let x = rng.gen::<usize>() % len;
210-
let y = rng.gen::<usize>() % len;
209+
let x = rng.r#gen::<usize>() % len;
210+
let y = rng.r#gen::<usize>() % len;
211211
v.swap(x, y);
212212
}
213213
v
@@ -217,7 +217,7 @@ fn gen_strings(len: usize) -> Vec<String> {
217217
let mut rng = crate::bench_rng();
218218
let mut v = vec![];
219219
for _ in 0..len {
220-
let n = rng.gen::<usize>() % 20 + 1;
220+
let n = rng.r#gen::<usize>() % 20 + 1;
221221
v.push(Alphanumeric.sample_string(&mut rng, n));
222222
}
223223
v

library/alloc/tests/sort/patterns.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,5 +207,5 @@ fn rand_root_seed() -> u64 {
207207

208208
fn random_vec(len: usize) -> Vec<i32> {
209209
let mut rng: XorShiftRng = rand::SeedableRng::seed_from_u64(get_or_init_rand_seed());
210-
(0..len).map(|_| rng.gen::<i32>()).collect()
210+
(0..len).map(|_| rng.r#gen::<i32>()).collect()
211211
}

library/alloc/tests/sort/zipf.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ impl ZipfDistribution {
8080

8181
loop {
8282
use std::cmp;
83-
let u: f64 = hnum + rng.gen::<f64>() * (self.h_integral_x1 - hnum);
83+
let u: f64 = hnum + rng.r#gen::<f64>() * (self.h_integral_x1 - hnum);
8484
// u is uniformly distributed in (h_integral_x1, h_integral_num_elements]
8585

8686
let x: f64 = ZipfDistribution::h_integral_inv(u, self.exponent);

0 commit comments

Comments
 (0)