@@ -2,8 +2,9 @@ use http::header::*;
22use http:: * ;
33
44use quickcheck:: { Arbitrary , Gen , QuickCheck , TestResult } ;
5+ use rand:: prelude:: IndexedRandom ;
56use rand:: rngs:: StdRng ;
6- use rand:: seq:: SliceRandom ;
7+ // use rand::seq::SliceRandom;
78use rand:: { Rng , SeedableRng } ;
89
910use std:: collections:: HashMap ;
@@ -76,12 +77,12 @@ impl Fuzz {
7677
7778 let mut steps = vec ! [ ] ;
7879 let mut expect = AltMap :: default ( ) ;
79- let num = rng. gen_range ( 5 ..500 ) ;
80+ let num = rng. random_range ( 5 ..500 ) ;
8081
8182 let weight = Weight {
82- insert : rng. gen_range ( 1 ..10 ) ,
83- remove : rng. gen_range ( 1 ..10 ) ,
84- append : rng. gen_range ( 1 ..10 ) ,
83+ insert : rng. random_range ( 1 ..10 ) ,
84+ remove : rng. random_range ( 1 ..10 ) ,
85+ append : rng. random_range ( 1 ..10 ) ,
8586 } ;
8687
8788 while steps. len ( ) < num {
@@ -112,7 +113,7 @@ impl Fuzz {
112113
113114impl Arbitrary for Fuzz {
114115 fn arbitrary ( _: & mut Gen ) -> Self {
115- Self :: new ( rand:: thread_rng ( ) . gen ( ) )
116+ Self :: new ( rand:: rng ( ) . random ( ) )
116117 }
117118}
118119
@@ -130,7 +131,7 @@ impl AltMap {
130131 fn gen_action ( & mut self , weight : & Weight , rng : & mut StdRng ) -> Action {
131132 let sum = weight. insert + weight. remove + weight. append ;
132133
133- let mut num = rng. gen_range ( 0 ..sum) ;
134+ let mut num = rng. random_range ( 0 ..sum) ;
134135
135136 if num < weight. insert {
136137 return self . gen_insert ( rng) ;
@@ -180,7 +181,7 @@ impl AltMap {
180181
181182 /// Negative numbers weigh finding an existing header higher
182183 fn gen_name ( & self , weight : i32 , rng : & mut StdRng ) -> HeaderName {
183- let mut existing = rng. gen_ratio ( 1 , weight. abs ( ) as u32 ) ;
184+ let mut existing = rng. random_ratio ( 1 , weight. abs ( ) as u32 ) ;
184185
185186 if weight < 0 {
186187 existing = !existing;
@@ -202,7 +203,7 @@ impl AltMap {
202203 if self . map . is_empty ( ) {
203204 None
204205 } else {
205- let n = rng. gen_range ( 0 ..self . map . len ( ) ) ;
206+ let n = rng. random_range ( 0 ..self . map . len ( ) ) ;
206207 self . map . keys ( ) . nth ( n) . map ( Clone :: clone)
207208 }
208209 }
@@ -337,7 +338,7 @@ fn gen_header_name(g: &mut StdRng) -> HeaderName {
337338 header:: X_XSS_PROTECTION ,
338339 ] ;
339340
340- if g. gen_ratio ( 1 , 2 ) {
341+ if g. random_ratio ( 1 , 2 ) {
341342 STANDARD_HEADERS . choose ( g) . unwrap ( ) . clone ( )
342343 } else {
343344 let value = gen_string ( g, 1 , 25 ) ;
0 commit comments