@@ -1160,7 +1160,7 @@ mod tests {
1160
1160
}
1161
1161
1162
1162
for _ in 0 ..1000 {
1163
- let v: $ty = rng . gen_range ( low.. high) ;
1163
+ let v = < $ty as SampleUniform > :: Sampler :: sample_single ( low, high, & mut rng ) ;
1164
1164
assert!( $le( low, v) && $lt( v, high) ) ;
1165
1165
}
1166
1166
}
@@ -1242,7 +1242,8 @@ mod tests {
1242
1242
assert!( low_scalar <= v && v < high_scalar) ;
1243
1243
let v = rng. sample( my_incl_uniform) . extract( lane) ;
1244
1244
assert!( low_scalar <= v && v <= high_scalar) ;
1245
- let v = rng. gen_range( low..high) . extract( lane) ;
1245
+ let v = <$ty as SampleUniform >:: Sampler
1246
+ :: sample_single( low, high, & mut rng) . extract( lane) ;
1246
1247
assert!( low_scalar <= v && v < high_scalar) ;
1247
1248
}
1248
1249
@@ -1253,7 +1254,9 @@ mod tests {
1253
1254
1254
1255
assert_eq!( zero_rng. sample( my_uniform) . extract( lane) , low_scalar) ;
1255
1256
assert_eq!( zero_rng. sample( my_incl_uniform) . extract( lane) , low_scalar) ;
1256
- assert_eq!( zero_rng. gen_range( low..high) . extract( lane) , low_scalar) ;
1257
+ assert_eq!( <$ty as SampleUniform >:: Sampler
1258
+ :: sample_single( low, high, & mut zero_rng)
1259
+ . extract( lane) , low_scalar) ;
1257
1260
assert!( max_rng. sample( my_uniform) . extract( lane) < high_scalar) ;
1258
1261
assert!( max_rng. sample( my_incl_uniform) . extract( lane) <= high_scalar) ;
1259
1262
@@ -1266,7 +1269,9 @@ mod tests {
1266
1269
( -1i64 << $bits_shifted) as u64 ,
1267
1270
) ;
1268
1271
assert!(
1269
- lowering_max_rng. gen_range( low..high) . extract( lane) < high_scalar
1272
+ <$ty as SampleUniform >:: Sampler
1273
+ :: sample_single( low, high, & mut lowering_max_rng)
1274
+ . extract( lane) < high_scalar
1270
1275
) ;
1271
1276
}
1272
1277
}
@@ -1312,9 +1317,9 @@ mod tests {
1312
1317
fn test_float_assertions ( ) {
1313
1318
use super :: SampleUniform ;
1314
1319
use std:: panic:: catch_unwind;
1315
- fn range < T : SampleUniform + PartialOrd > ( low : T , high : T ) {
1320
+ fn range < T : SampleUniform > ( low : T , high : T ) {
1316
1321
let mut rng = crate :: test:: rng ( 253 ) ;
1317
- rng . gen_range ( low.. high) ;
1322
+ T :: Sampler :: sample_single ( low, high, & mut rng ) ;
1318
1323
}
1319
1324
1320
1325
macro_rules! t {
0 commit comments