@@ -6,8 +6,6 @@ use quickcheck::Arbitrary;
6
6
use quickcheck:: Gen ;
7
7
use quickcheck:: TestResult ;
8
8
9
- use rand:: Rng ;
10
-
11
9
use fnv:: FnvHasher ;
12
10
use std:: hash:: { BuildHasher , BuildHasherDefault } ;
13
11
type FnvBuilder = BuildHasherDefault < FnvHasher > ;
@@ -96,7 +94,8 @@ quickcheck! {
96
94
true
97
95
}
98
96
99
- fn with_cap( cap: usize ) -> bool {
97
+ fn with_cap( template: Vec <( ) >) -> bool {
98
+ let cap = template. len( ) ;
100
99
let map: IndexMap <u8 , u8 > = IndexMap :: with_capacity( cap) ;
101
100
println!( "wish: {}, got: {} (diff: {})" , cap, map. capacity( ) , map. capacity( ) as isize - cap as isize ) ;
102
101
map. capacity( ) >= cap
@@ -199,8 +198,8 @@ where
199
198
K : Arbitrary ,
200
199
V : Arbitrary ,
201
200
{
202
- fn arbitrary < G : Gen > ( g : & mut G ) -> Self {
203
- match g . gen :: < u32 > ( ) % 4 {
201
+ fn arbitrary ( g : & mut Gen ) -> Self {
202
+ match u32 :: arbitrary ( g ) % 4 {
204
203
0 => Add ( K :: arbitrary ( g) , V :: arbitrary ( g) ) ,
205
204
1 => AddEntry ( K :: arbitrary ( g) , V :: arbitrary ( g) ) ,
206
205
2 => Remove ( K :: arbitrary ( g) ) ,
@@ -452,12 +451,12 @@ impl Deref for Alpha {
452
451
const ALPHABET : & [ u8 ] = b"abcdefghijklmnopqrstuvwxyz" ;
453
452
454
453
impl Arbitrary for Alpha {
455
- fn arbitrary < G : Gen > ( g : & mut G ) -> Self {
456
- let len = g . next_u32 ( ) % g. size ( ) as u32 ;
454
+ fn arbitrary ( g : & mut Gen ) -> Self {
455
+ let len = usize :: arbitrary ( g ) % g. size ( ) ;
457
456
let len = min ( len, 16 ) ;
458
457
Alpha (
459
458
( 0 ..len)
460
- . map ( |_| ALPHABET [ g . next_u32 ( ) as usize % ALPHABET . len ( ) ] as char )
459
+ . map ( |_| ALPHABET [ usize :: arbitrary ( g ) % ALPHABET . len ( ) ] as char )
461
460
. collect ( ) ,
462
461
)
463
462
}
@@ -482,8 +481,8 @@ impl<T> Arbitrary for Large<Vec<T>>
482
481
where
483
482
T : Arbitrary ,
484
483
{
485
- fn arbitrary < G : Gen > ( g : & mut G ) -> Self {
486
- let len = g . next_u32 ( ) % ( g. size ( ) * 10 ) as u32 ;
484
+ fn arbitrary ( g : & mut Gen ) -> Self {
485
+ let len = usize :: arbitrary ( g ) % ( g. size ( ) * 10 ) ;
487
486
Large ( ( 0 ..len) . map ( |_| T :: arbitrary ( g) ) . collect ( ) )
488
487
}
489
488
0 commit comments