@@ -9,8 +9,8 @@ use clap::Parser;
99use graph:: data:: value:: { Object , Word } ;
1010use graph:: object;
1111use graph:: prelude:: { lazy_static, q, r, BigDecimal , BigInt , QueryResult } ;
12- use rand:: SeedableRng ;
1312use rand:: { rngs:: SmallRng , Rng } ;
13+ use rand:: { RngCore , SeedableRng } ;
1414
1515use graph:: util:: cache_weight:: CacheWeight ;
1616use graph:: util:: lfu_cache:: LfuCache ;
@@ -240,8 +240,8 @@ impl Template for BigInt {
240240 fn create ( size : usize , rng : Option < & mut SmallRng > ) -> Self {
241241 let f = match rng {
242242 Some ( rng) => {
243- let mag = rng. gen_range ( 1 ..100 ) ;
244- if rng. gen_bool ( 0.5 ) {
243+ let mag = rng. random_range ( 1 ..100 ) ;
244+ if rng. random_bool ( 0.5 ) {
245245 mag
246246 } else {
247247 -mag
@@ -261,8 +261,8 @@ impl Template for BigDecimal {
261261 fn create ( size : usize , mut rng : Option < & mut SmallRng > ) -> Self {
262262 let f = match rng. as_deref_mut ( ) {
263263 Some ( rng) => {
264- let mag = rng. gen_range ( 1i32 ..100 ) ;
265- if rng. gen_bool ( 0.5 ) {
264+ let mag = rng. random_range ( 1i32 ..100 ) ;
265+ if rng. random_bool ( 0.5 ) {
266266 mag
267267 } else {
268268 -mag
@@ -271,7 +271,7 @@ impl Template for BigDecimal {
271271 None => 1 ,
272272 } ;
273273 let exp = match rng {
274- Some ( rng) => rng. gen_range ( -100 ..=100 ) ,
274+ Some ( rng) => rng. random_range ( -100 ..=100 ) ,
275275 None => 1 ,
276276 } ;
277277 let bi = BigInt :: from ( 3u64 ) . pow ( size as u8 ) . unwrap ( ) * BigInt :: from ( f) ;
@@ -307,7 +307,7 @@ fn make_object(size: usize, mut rng: Option<&mut SmallRng>) -> Object {
307307 for i in 0 ..size {
308308 let kind = rng
309309 . as_deref_mut ( )
310- . map ( |rng| rng. gen_range ( 0 ..modulus) )
310+ . map ( |rng| rng. random_range ( 0 ..modulus) )
311311 . unwrap_or ( i % modulus) ;
312312
313313 let value = match kind {
@@ -334,7 +334,11 @@ fn make_object(size: usize, mut rng: Option<&mut SmallRng>) -> Object {
334334 _ => unreachable ! ( ) ,
335335 } ;
336336
337- let key = rng. as_deref_mut ( ) . map ( |rng| rng. gen ( ) ) . unwrap_or ( i) % modulus;
337+ let key = rng
338+ . as_deref_mut ( )
339+ . map ( |rng| rng. next_u32 ( ) as usize )
340+ . unwrap_or ( i)
341+ % modulus;
338342 obj. push ( ( Word :: from ( format ! ( "val{}" , key) ) , value) ) ;
339343 }
340344 Object :: from_iter ( obj)
@@ -406,7 +410,7 @@ impl ValueMap {
406410 for i in 0 ..size {
407411 let kind = rng
408412 . as_deref_mut ( )
409- . map ( |rng| rng. gen_range ( 0 ..modulus) )
413+ . map ( |rng| rng. random_range ( 0 ..modulus) )
410414 . unwrap_or ( i % modulus) ;
411415
412416 let value = match kind {
@@ -431,7 +435,11 @@ impl ValueMap {
431435 _ => unreachable ! ( ) ,
432436 } ;
433437
434- let key = rng. as_deref_mut ( ) . map ( |rng| rng. gen ( ) ) . unwrap_or ( i) % modulus;
438+ let key = rng
439+ . as_deref_mut ( )
440+ . map ( |rng| rng. next_u32 ( ) as usize )
441+ . unwrap_or ( i)
442+ % modulus;
435443 map. insert ( format ! ( "val{}" , key) , value) ;
436444 }
437445 MapMeasure ( map)
@@ -466,7 +474,10 @@ impl UsizeMap {
466474 fn make_map ( size : usize , mut rng : Option < & mut SmallRng > ) -> Self {
467475 let mut map = BTreeMap :: new ( ) ;
468476 for i in 0 ..size {
469- let key = rng. as_deref_mut ( ) . map ( |rng| rng. gen ( ) ) . unwrap_or ( 2 * i) ;
477+ let key = rng
478+ . as_deref_mut ( )
479+ . map ( |rng| rng. next_u32 ( ) as usize )
480+ . unwrap_or ( 2 * i) ;
470481 map. insert ( key, i * 3 ) ;
471482 }
472483 MapMeasure ( map)
@@ -563,7 +574,10 @@ fn maybe_rng<'a>(opt: &'a Opt, rng: &'a mut SmallRng) -> Option<&'a mut SmallRng
563574
564575fn stress < T : Template > ( opt : & Opt ) {
565576 let mut rng = match opt. seed {
566- None => SmallRng :: from_entropy ( ) ,
577+ None => {
578+ let mut rng = rand:: rng ( ) ;
579+ SmallRng :: from_rng ( & mut rng)
580+ }
567581 Some ( seed) => SmallRng :: seed_from_u64 ( seed) ,
568582 } ;
569583
@@ -624,7 +638,7 @@ fn stress<T: Template>(opt: &Opt) {
624638 let size = if opt. fixed || opt. obj_size == 0 {
625639 opt. obj_size
626640 } else {
627- rng. gen_range ( 0 ..opt. obj_size )
641+ rng. random_range ( 0 ..opt. obj_size )
628642 } ;
629643 let before = ALLOCATED . load ( SeqCst ) ;
630644 let sample = template. sample ( size, maybe_rng ( opt, & mut rng) ) ;
@@ -638,7 +652,7 @@ fn stress<T: Template>(opt: &Opt) {
638652 cache. insert ( key, Entry :: from ( * sample) ) ;
639653 // Do a few random reads from the cache
640654 for _attempt in 0 ..5 {
641- let read = rng. gen_range ( 0 ..=key) ;
655+ let read = rng. random_range ( 0 ..=key) ;
642656 let _v = cache. get ( & read) ;
643657 }
644658 }
0 commit comments