@@ -2,8 +2,8 @@ use http::header::*;
2
2
use http:: * ;
3
3
4
4
use quickcheck:: { Arbitrary , Gen , QuickCheck , TestResult } ;
5
+ use rand:: prelude:: IndexedRandom ;
5
6
use rand:: rngs:: StdRng ;
6
- use rand:: seq:: SliceRandom ;
7
7
use rand:: { Rng , SeedableRng } ;
8
8
9
9
use std:: collections:: HashMap ;
@@ -76,12 +76,12 @@ impl Fuzz {
76
76
77
77
let mut steps = vec ! [ ] ;
78
78
let mut expect = AltMap :: default ( ) ;
79
- let num = rng. gen_range ( 5 ..500 ) ;
79
+ let num = rng. random_range ( 5 ..500 ) ;
80
80
81
81
let weight = Weight {
82
- insert : rng. gen_range ( 1 ..10 ) ,
83
- remove : rng. gen_range ( 1 ..10 ) ,
84
- append : rng. gen_range ( 1 ..10 ) ,
82
+ insert : rng. random_range ( 1 ..10 ) ,
83
+ remove : rng. random_range ( 1 ..10 ) ,
84
+ append : rng. random_range ( 1 ..10 ) ,
85
85
} ;
86
86
87
87
while steps. len ( ) < num {
@@ -112,7 +112,7 @@ impl Fuzz {
112
112
113
113
impl Arbitrary for Fuzz {
114
114
fn arbitrary ( _: & mut Gen ) -> Self {
115
- Self :: new ( rand:: thread_rng ( ) . gen ( ) )
115
+ Self :: new ( rand:: rng ( ) . random ( ) )
116
116
}
117
117
}
118
118
@@ -130,7 +130,7 @@ impl AltMap {
130
130
fn gen_action ( & mut self , weight : & Weight , rng : & mut StdRng ) -> Action {
131
131
let sum = weight. insert + weight. remove + weight. append ;
132
132
133
- let mut num = rng. gen_range ( 0 ..sum) ;
133
+ let mut num = rng. random_range ( 0 ..sum) ;
134
134
135
135
if num < weight. insert {
136
136
return self . gen_insert ( rng) ;
@@ -180,7 +180,7 @@ impl AltMap {
180
180
181
181
/// Negative numbers weigh finding an existing header higher
182
182
fn gen_name ( & self , weight : i32 , rng : & mut StdRng ) -> HeaderName {
183
- let mut existing = rng. gen_ratio ( 1 , weight. abs ( ) as u32 ) ;
183
+ let mut existing = rng. random_ratio ( 1 , weight. abs ( ) as u32 ) ;
184
184
185
185
if weight < 0 {
186
186
existing = !existing;
@@ -202,7 +202,7 @@ impl AltMap {
202
202
if self . map . is_empty ( ) {
203
203
None
204
204
} else {
205
- let n = rng. gen_range ( 0 ..self . map . len ( ) ) ;
205
+ let n = rng. random_range ( 0 ..self . map . len ( ) ) ;
206
206
self . map . keys ( ) . nth ( n) . map ( Clone :: clone)
207
207
}
208
208
}
@@ -337,7 +337,7 @@ fn gen_header_name(g: &mut StdRng) -> HeaderName {
337
337
header:: X_XSS_PROTECTION ,
338
338
] ;
339
339
340
- if g. gen_ratio ( 1 , 2 ) {
340
+ if g. random_ratio ( 1 , 2 ) {
341
341
STANDARD_HEADERS . choose ( g) . unwrap ( ) . clone ( )
342
342
} else {
343
343
let value = gen_string ( g, 1 , 25 ) ;
0 commit comments