Skip to content

Commit 98de9ab

Browse files
committed
Update dev-dependencies
1 parent 916d1c9 commit 98de9ab

File tree

2 files changed

+12
-13
lines changed

2 files changed

+12
-13
lines changed

Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,9 @@ default-features = false
4646
features = ["raw"]
4747

4848
[dev-dependencies]
49-
itertools = "0.9"
50-
rand = {version = "0.7", features = ["small_rng"] }
51-
quickcheck = { version = "0.9", default-features = false }
49+
itertools = "0.10"
50+
rand = {version = "0.8", features = ["small_rng"] }
51+
quickcheck = { version = "1.0", default-features = false }
5252
fnv = "1.0"
5353
lazy_static = "1.3"
5454
fxhash = "0.2.1"

tests/quick.rs

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@ use quickcheck::Arbitrary;
66
use quickcheck::Gen;
77
use quickcheck::TestResult;
88

9-
use rand::Rng;
10-
119
use fnv::FnvHasher;
1210
use std::hash::{BuildHasher, BuildHasherDefault};
1311
type FnvBuilder = BuildHasherDefault<FnvHasher>;
@@ -96,7 +94,8 @@ quickcheck! {
9694
true
9795
}
9896

99-
fn with_cap(cap: usize) -> bool {
97+
fn with_cap(template: Vec<()>) -> bool {
98+
let cap = template.len();
10099
let map: IndexMap<u8, u8> = IndexMap::with_capacity(cap);
101100
println!("wish: {}, got: {} (diff: {})", cap, map.capacity(), map.capacity() as isize - cap as isize);
102101
map.capacity() >= cap
@@ -199,8 +198,8 @@ where
199198
K: Arbitrary,
200199
V: Arbitrary,
201200
{
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 {
204203
0 => Add(K::arbitrary(g), V::arbitrary(g)),
205204
1 => AddEntry(K::arbitrary(g), V::arbitrary(g)),
206205
2 => Remove(K::arbitrary(g)),
@@ -452,12 +451,12 @@ impl Deref for Alpha {
452451
const ALPHABET: &[u8] = b"abcdefghijklmnopqrstuvwxyz";
453452

454453
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();
457456
let len = min(len, 16);
458457
Alpha(
459458
(0..len)
460-
.map(|_| ALPHABET[g.next_u32() as usize % ALPHABET.len()] as char)
459+
.map(|_| ALPHABET[usize::arbitrary(g) % ALPHABET.len()] as char)
461460
.collect(),
462461
)
463462
}
@@ -482,8 +481,8 @@ impl<T> Arbitrary for Large<Vec<T>>
482481
where
483482
T: Arbitrary,
484483
{
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);
487486
Large((0..len).map(|_| T::arbitrary(g)).collect())
488487
}
489488

0 commit comments

Comments
 (0)