Skip to content

Commit a878793

Browse files
compiler-errorscompiler-errors
committed
Un-gracefully convert library benches to r#gen
1 parent ee6efaf commit a878793

File tree

6 files changed

+25
-25
lines changed

6 files changed

+25
-25
lines changed

‎library/alloc/benches/btree/map.rs

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

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

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

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

@@ -105,7 +105,7 @@ macro_rules! map_find_rand_bench {
105105

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

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

172172
for _ in 0..size {
173-
map.insert(rng.gen(), rng.gen());
173+
map.insert(rng.r#gen(), rng.r#gen());
174174
}
175175

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

202202
for _ in 0..size {
203-
map.insert(rng.gen(), rng.gen());
203+
map.insert(rng.r#gen(), rng.r#gen());
204204
}
205205

206206
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/src/slice/tests.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -218,8 +218,8 @@ fn panic_safe() {
218218
}
219219

220220
for _ in 0..5 {
221-
let a = rng.gen::<usize>() % len;
222-
let b = rng.gen::<usize>() % len;
221+
let a = rng.r#gen::<usize>() % len;
222+
let b = rng.r#gen::<usize>() % len;
223223
if a < b {
224224
input[a..b].reverse();
225225
} else {
@@ -281,8 +281,8 @@ fn test_sort() {
281281
v.sort();
282282
v.reverse();
283283
for _ in 0..5 {
284-
let a = rng.gen::<usize>() % len;
285-
let b = rng.gen::<usize>() % len;
284+
let a = rng.r#gen::<usize>() % len;
285+
let b = rng.r#gen::<usize>() % len;
286286
if a < b {
287287
v[a..b].reverse();
288288
} else {
@@ -340,7 +340,7 @@ fn test_sort_stability() {
340340
// will occur in sorted order.
341341
let orig: Vec<_> = (0..len)
342342
.map(|_| {
343-
let n = rng.gen::<usize>() % 10;
343+
let n = rng.r#gen::<usize>() % 10;
344344
counts[n] += 1;
345345
(n, counts[n])
346346
})

‎library/core/benches/num/int_log/mod.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ macro_rules! int_log10_bench {
2121
/* Exponentially distributed random numbers from the whole range of the type. */
2222
let numbers: Vec<$t> = (0..256)
2323
.map(|_| {
24-
let x = rng.gen::<$t>() >> rng.gen_range(0..<$t>::BITS);
24+
let x = rng.r#gen::<$t>() >> rng.gen_range(0..<$t>::BITS);
2525
if x != 0 { x } else { 1 }
2626
})
2727
.collect();
@@ -38,7 +38,7 @@ macro_rules! int_log10_bench {
3838
/* Exponentially distributed random numbers from the range 0..256. */
3939
let numbers: Vec<$t> = (0..256)
4040
.map(|_| {
41-
let x = (rng.gen::<u8>() >> rng.gen_range(0..u8::BITS)) as $t;
41+
let x = (rng.r#gen::<u8>() >> rng.gen_range(0..u8::BITS)) as $t;
4242
if x != 0 { x } else { 1 }
4343
})
4444
.collect();
@@ -65,7 +65,7 @@ macro_rules! int_log_bench {
6565
/* Exponentially distributed random numbers from the whole range of the type. */
6666
let numbers: Vec<$t> = (0..256)
6767
.map(|_| {
68-
let x = rng.gen::<$t>() >> rng.gen_range(0..<$t>::BITS);
68+
let x = rng.r#gen::<$t>() >> rng.gen_range(0..<$t>::BITS);
6969
if x >= 2 { x } else { 2 }
7070
})
7171
.collect();
@@ -84,7 +84,7 @@ macro_rules! int_log_bench {
8484
/* Exponentially distributed random numbers from the range 0..256. */
8585
let numbers: Vec<$t> = (0..256)
8686
.map(|_| {
87-
let x = (rng.gen::<u8>() >> rng.gen_range(0..u8::BITS)) as $t;
87+
let x = (rng.r#gen::<u8>() >> rng.gen_range(0..u8::BITS)) as $t;
8888
if x >= 2 { x } else { 2 }
8989
})
9090
.collect();

‎library/core/tests/slice.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1820,7 +1820,7 @@ fn sort_unstable() {
18201820
for &modulus in &[5, 10, 100, 1000] {
18211821
for _ in 0..rounds {
18221822
for i in 0..len {
1823-
v[i] = rng.gen::<i32>() % modulus;
1823+
v[i] = rng.r#gen::<i32>() % modulus;
18241824
}
18251825

18261826
// Sort in default order.
@@ -1867,7 +1867,7 @@ fn select_nth_unstable() {
18671867
for &modulus in &[5, 10, 1000] {
18681868
for _ in 0..10 {
18691869
for i in 0..len {
1870-
orig[i] = rng.gen::<i32>() % modulus;
1870+
orig[i] = rng.r#gen::<i32>() % modulus;
18711871
}
18721872

18731873
let v_sorted = {

0 commit comments

Comments
 (0)