@@ -2,8 +2,8 @@ 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 ; 
77use  rand:: { Rng ,  SeedableRng } ; 
88
99use  std:: collections:: HashMap ; 
@@ -76,12 +76,12 @@ impl Fuzz {
7676
7777        let  mut  steps = vec ! [ ] ; 
7878        let  mut  expect = AltMap :: default ( ) ; 
79-         let  num = rng. gen_range ( 5 ..500 ) ; 
79+         let  num = rng. random_range ( 5 ..500 ) ; 
8080
8181        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 ) , 
8585        } ; 
8686
8787        while  steps. len ( )  < num { 
@@ -112,7 +112,7 @@ impl Fuzz {
112112
113113impl  Arbitrary  for  Fuzz  { 
114114    fn  arbitrary ( _:  & mut  Gen )  -> Self  { 
115-         Self :: new ( rand:: thread_rng ( ) . gen ( ) ) 
115+         Self :: new ( rand:: rng ( ) . random ( ) ) 
116116    } 
117117} 
118118
@@ -130,7 +130,7 @@ impl AltMap {
130130fn  gen_action ( & mut  self ,  weight :  & Weight ,  rng :  & mut  StdRng )  -> Action  { 
131131        let  sum = weight. insert  + weight. remove  + weight. append ; 
132132
133-         let  mut  num = rng. gen_range ( 0 ..sum) ; 
133+         let  mut  num = rng. random_range ( 0 ..sum) ; 
134134
135135        if  num < weight. insert  { 
136136            return  self . gen_insert ( rng) ; 
@@ -180,7 +180,7 @@ impl AltMap {
180180
181181    /// Negative numbers weigh finding an existing header higher 
182182fn  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 ) ; 
184184
185185        if  weight < 0  { 
186186            existing = !existing; 
@@ -202,7 +202,7 @@ impl AltMap {
202202        if  self . map . is_empty ( )  { 
203203            None 
204204        }  else  { 
205-             let  n = rng. gen_range ( 0 ..self . map . len ( ) ) ; 
205+             let  n = rng. random_range ( 0 ..self . map . len ( ) ) ; 
206206            self . map . keys ( ) . nth ( n) . map ( Clone :: clone) 
207207        } 
208208    } 
@@ -337,7 +337,7 @@ fn gen_header_name(g: &mut StdRng) -> HeaderName {
337337        header:: X_XSS_PROTECTION , 
338338    ] ; 
339339
340-     if  g. gen_ratio ( 1 ,  2 )  { 
340+     if  g. random_ratio ( 1 ,  2 )  { 
341341        STANDARD_HEADERS . choose ( g) . unwrap ( ) . clone ( ) 
342342    }  else  { 
343343        let  value = gen_string ( g,  1 ,  25 ) ; 
0 commit comments