Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[WIP] Upgrade rand to 0.9 #328

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[WIP] Upgrade rand to 0.9 #328

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,4 @@ name = "quickcheck"
[dependencies]
env_logger = { version = "0.8.2", default-features = false, optional = true }
log = { version = "0.4", optional = true }
rand = { version = "0.8", default-features = false, features = ["getrandom", "small_rng"] }
rand = { version = "0.9", default-features = false, features = ["os_rng", "small_rng"] }
63 changes: 31 additions & 32 deletions src/arbitrary.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ use std::path::PathBuf;
use std::sync::Arc;
use std::time::{Duration, SystemTime, UNIX_EPOCH};

use rand::seq::SliceRandom;
use rand::seq::IndexedRandom;
use rand::{self, Rng, SeedableRng};

/// Gen represents a PRNG.
Expand All @@ -47,7 +47,7 @@ impl Gen {
/// randomly generated number. (Unless that number is used to control the
/// size of a data structure.)
pub fn new(size: usize) -> Gen {
Gen { rng: rand::rngs::SmallRng::from_entropy(), size: size }
Gen { rng: rand::rngs::SmallRng::from_os_rng(), size: size }
}

/// Returns the size configured with this generator.
Expand All @@ -64,15 +64,15 @@ impl Gen {

fn gen<T>(&mut self) -> T
where
rand::distributions::Standard: rand::distributions::Distribution<T>,
rand::distr::StandardUniform: rand::distr::Distribution<T>,
{
self.rng.gen()
self.rng.random()
}

fn gen_range<T, R>(&mut self, range: R) -> T
where
T: rand::distributions::uniform::SampleUniform,
R: rand::distributions::uniform::SampleRange<T>,
T: rand::distr::uniform::SampleUniform,
R: rand::distr::uniform::SampleRange<T>,
{
self.rng.gen_range(range)
}
Expand Down Expand Up @@ -795,7 +795,7 @@ macro_rules! unsigned_arbitrary {
}

unsigned_arbitrary! {
usize, u8, u16, u32, u64, u128
u8, u16, u32, u64, u128
}

macro_rules! signed_shrinker {
Expand Down Expand Up @@ -867,7 +867,7 @@ macro_rules! signed_arbitrary {
}

signed_arbitrary! {
isize, i8, i16, i32, i64, i128
i8, i16, i32, i64, i128
}

macro_rules! float_problem_values {
Expand Down Expand Up @@ -969,7 +969,6 @@ macro_rules! unsigned_non_zero_arbitrary {
}

unsigned_non_zero_arbitrary! {
NonZeroUsize => usize,
NonZeroU8 => u8,
NonZeroU16 => u16,
NonZeroU32 => u32,
Expand Down Expand Up @@ -1174,12 +1173,12 @@ mod test {

#[test]
fn arby_int() {
arby_int!(true, i8, i16, i32, i64, isize, i128);
arby_int!(true, i8, i16, i32, i64, i128);
}

#[test]
fn arby_uint() {
arby_int!(false, u8, u16, u32, u64, usize, u128);
arby_int!(false, u8, u16, u32, u64, u128);
}

macro_rules! arby_float {
Expand Down Expand Up @@ -1282,9 +1281,9 @@ mod test {
#[test]
fn ints() {
// TODO: Test overflow?
eq(5isize, vec![0, 3, 4]);
eq(-5isize, vec![5, 0, -3, -4]);
eq(0isize, vec![]);
// eq(5isize, vec![0, 3, 4]);
// eq(-5isize, vec![5, 0, -3, -4]);
// eq(0isize, vec![]);
}

#[test]
Expand Down Expand Up @@ -1324,8 +1323,8 @@ mod test {

#[test]
fn uints() {
eq(5usize, vec![0, 3, 4]);
eq(0usize, vec![]);
// eq(5usize, vec![0, 3, 4]);
// eq(0usize, vec![]);
}

#[test]
Expand Down Expand Up @@ -1414,22 +1413,22 @@ mod test {
fn vecs() {
eq(
{
let it: Vec<isize> = vec![];
let it: Vec<i64> = vec![];
it
},
vec![],
);
eq(
{
let it: Vec<Vec<isize>> = vec![vec![]];
let it: Vec<Vec<i64>> = vec![vec![]];
it
},
vec![vec![]],
);
eq(vec![1isize], vec![vec![], vec![0]]);
eq(vec![11isize], vec![vec![], vec![0], vec![6], vec![9], vec![10]]);
eq(vec![1_i64], vec![vec![], vec![0]]);
eq(vec![11_i64], vec![vec![], vec![0], vec![6], vec![9], vec![10]]);
eq(
vec![3isize, 5],
vec![3_i64, 5],
vec![
vec![],
vec![5],
Expand All @@ -1451,7 +1450,7 @@ mod test {

{
let mut map = $ctor;
map.insert(1usize, 1isize);
map.insert(1_u64, 1_i64);

let shrinks = vec![
$ctor,
Expand All @@ -1473,8 +1472,8 @@ mod test {
};
}

map_tests!(btreemap, BTreeMap::<usize, isize>::new());
map_tests!(hashmap, HashMap::<usize, isize>::new());
map_tests!(btreemap, BTreeMap::<u64, i64>::new());
map_tests!(hashmap, HashMap::<u64, i64>::new());

macro_rules! list_tests {
($name:ident, $ctor:expr, $push:ident) => {
Expand All @@ -1484,7 +1483,7 @@ mod test {

{
let mut list = $ctor;
list.$push(2usize);
list.$push(2_u64);

let shrinks = vec![
$ctor,
Expand All @@ -1506,21 +1505,21 @@ mod test {
};
}

list_tests!(btreesets, BTreeSet::<usize>::new(), insert);
list_tests!(hashsets, HashSet::<usize>::new(), insert);
list_tests!(linkedlists, LinkedList::<usize>::new(), push_back);
list_tests!(vecdeques, VecDeque::<usize>::new(), push_back);
list_tests!(btreesets, BTreeSet::<u64>::new(), insert);
list_tests!(hashsets, HashSet::<u64>::new(), insert);
list_tests!(linkedlists, LinkedList::<u64>::new(), push_back);
list_tests!(vecdeques, VecDeque::<u64>::new(), push_back);

#[test]
fn binaryheaps() {
ordered_eq(
BinaryHeap::<usize>::new().into_iter().collect::<Vec<_>>(),
BinaryHeap::<u64>::new().into_iter().collect::<Vec<_>>(),
vec![],
);

{
let mut heap = BinaryHeap::<usize>::new();
heap.push(2usize);
let mut heap = BinaryHeap::<u64>::new();
heap.push(2_u64);

let shrinks = vec![vec![], vec![0], vec![1]];

Expand Down
2 changes: 1 addition & 1 deletion src/tester.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ impl QuickCheck {

let n_tests_passed = match self.quicktest(f) {
Ok(n_tests_passed) => n_tests_passed,
Err(result) => panic!(result.failed_msg()),
Err(result) => panic!("{}", result.failed_msg()),
};

if n_tests_passed >= self.min_tests_passed {
Expand Down
Loading