@@ -16,18 +16,18 @@ const KEY_RUN_LEN: usize = 8;
1616const KEY_MAX_VAL : u8 = 4 ;
1717
1818impl Arbitrary for Key {
19- fn arbitrary < G : Gen > ( g : & mut G ) -> Key {
20- let len = g . gen :: < usize > ( ) % KEY_RUN_LEN ;
19+ fn arbitrary ( g : & mut Gen ) -> Key {
20+ let len = usize :: arbitrary ( g ) % KEY_RUN_LEN ;
2121 let mut key = Vec :: with_capacity ( len) ;
2222 for _ in 0 ..len {
23- key. push ( g . gen :: < u8 > ( ) % KEY_MAX_VAL ) ;
23+ key. push ( u8 :: arbitrary ( g ) % KEY_MAX_VAL ) ;
2424 }
2525 Key ( key)
2626 }
2727}
2828
2929impl Key {
30- fn extend_random < G : Gen > ( & self , g : & mut G ) -> Key {
30+ fn extend_random ( & self , g : & mut Gen ) -> Key {
3131 self . extend ( Key :: arbitrary ( g) )
3232 }
3333
@@ -49,18 +49,18 @@ impl TrieKey for Key {
4949}
5050
5151impl Arbitrary for RandomKeys {
52- fn arbitrary < G : Gen > ( g : & mut G ) -> RandomKeys {
53- let num_keys = g . gen :: < usize > ( ) % MAX_KEYS ;
52+ fn arbitrary ( g : & mut Gen ) -> RandomKeys {
53+ let num_keys = usize :: arbitrary ( g ) % MAX_KEYS ;
5454 let mut keys = Vec :: with_capacity ( num_keys) ;
5555 keys. push ( Key :: arbitrary ( g) ) ;
5656
5757 for _ in 0 ..num_keys {
58- match g . gen :: < u8 > ( ) % 10 {
58+ match u8 :: arbitrary ( g ) % 10 {
5959 // Generate a new random key.
6060 1 => keys. push ( Key :: arbitrary ( g) ) ,
6161 // Extend an existing key.
6262 _ => {
63- let i = g . gen :: < usize > ( ) % keys. len ( ) ;
63+ let i = usize :: arbitrary ( g ) % keys. len ( ) ;
6464 let key = keys[ i] . extend_random ( g) ;
6565 keys. push ( key) ;
6666 }
0 commit comments