remove rand as a public dependency + rollup and other cleanups

.github/workflows/ci.yml

@@ -23,7 +23,7 @@ jobs:
         include:
         - build: pinned
           os: ubuntu-18.04
-          rust: 1.34.0
+          rust: 1.46.0
         - build: stable
           os: ubuntu-18.04
           rust: stable

Cargo.toml

@@ -26,7 +26,6 @@ regex = ["env_logger/regex"]
 name = "quickcheck"
 
 [dependencies]
-env_logger = { version = "0.7.0", default-features = false, optional = true }
+env_logger = { version = "0.8.2", default-features = false, optional = true }
 log = { version = "0.4", optional = true }
-rand = "0.7"
-rand_core = "0.5"
+rand = { version = "0.8", default-features = false, features = ["small_rng", "std"] }

README.md

@@ -135,7 +135,7 @@ default and thus no longer available.
 
 ### Minimum Rust version policy
 
-This crate's minimum supported `rustc` version is `1.34.0`.
+This crate's minimum supported `rustc` version is `1.46.0`.
 
 The current policy is that the minimum Rust version required to use this crate
 can be increased in minor version updates. For example, if `crate 1.0` requires
@@ -195,7 +195,7 @@ trait. Great, so what is this `Testable` business?
 
 ```rust
 pub trait Testable {
-    fn result<G: Gen>(&self, &mut G) -> TestResult;
+    fn result(&self, &mut Gen) -> TestResult;
 }
 ```
 
@@ -207,7 +207,7 @@ Sure enough, `bool` satisfies the `Testable` trait:
 
 ```rust
 impl Testable for bool {
-    fn result<G: Gen>(&self, _: &mut G) -> TestResult {
+    fn result(&self, _: &mut Gen) -> TestResult {
         TestResult::from_bool(*self)
     }
 }
@@ -218,7 +218,7 @@ satisfy `Testable` too!
 
 ```rust
 impl<A: Arbitrary + Debug, B: Testable> Testable for fn(A) -> B {
-    fn result<G: Gen>(&self, g: &mut G) -> TestResult {
+    fn result(&self, g: &mut Gen) -> TestResult {
         // elided
     }
 }
@@ -236,7 +236,7 @@ make sure `TestResult` satisfies `Testable`:
 
 ```rust
 impl Testable for TestResult {
-    fn result<G: Gen>(&self, _: &mut G) -> TestResult { self.clone() }
+    fn result(&self, _: &mut Gen) -> TestResult { self.clone() }
 }
 ```
 
@@ -406,7 +406,7 @@ the trait `Arbitrary` for the struct `Point`:
 use quickcheck::{Arbitrary, Gen};
 
 impl Arbitrary for Point {
-    fn arbitrary<G: Gen>(g: &mut G) -> Point {
+    fn arbitrary(g: &mut Gen) -> Point {
         Point {
             x: i32::arbitrary(g),
             y: i32::arbitrary(g),

examples/btree_set_range.rs

@@ -1,16 +1,16 @@
-extern crate quickcheck;
-
-use quickcheck::{quickcheck, TestResult};
 use std::collections::BTreeSet;
 use std::ops::Bound::{self, *};
 
+use quickcheck::{quickcheck, TestResult};
+
 /// Covers every `std::ops::Range*` plus variants with exclusive start.
 type RangeAny<T> = (Bound<T>, Bound<T>);
 
 /// Mimic `RangeBounds::contains`, stabilized in Rust 1.35.
 trait RangeBounds<T> {
     fn contains(&self, _: &T) -> bool;
 }
+
 impl<T: PartialOrd> RangeBounds<T> for RangeAny<T> {
     fn contains(&self, item: &T) -> bool {
         (match &self.0 {

examples/out_of_bounds.rs

@@ -1,5 +1,3 @@
-extern crate quickcheck;
-
 use quickcheck::{quickcheck, TestResult};
 
 fn main() {

examples/reverse.rs

@@ -1,5 +1,3 @@
-extern crate quickcheck;
-
 use quickcheck::quickcheck;
 
 fn reverse<T: Clone>(xs: &[T]) -> Vec<T> {

examples/reverse_single.rs

@@ -1,5 +1,3 @@
-extern crate quickcheck;
-
 use quickcheck::{quickcheck, TestResult};
 
 fn reverse<T: Clone>(xs: &[T]) -> Vec<T> {

examples/sieve.rs

@@ -1,5 +1,3 @@
-extern crate quickcheck;
-
 use quickcheck::quickcheck;
 
 fn sieve(n: usize) -> Vec<usize> {

examples/sort.rs

@@ -1,16 +1,14 @@
 // This is a buggy quick sort implementation, QuickCheck will find the bug for
 // you.
 
-extern crate quickcheck;
-
 use quickcheck::quickcheck;
 
 fn smaller_than<T: Clone + Ord>(xs: &[T], pivot: &T) -> Vec<T> {
-    return xs.iter().filter(|&x| *x < *pivot).map(|x| x.clone()).collect();
+    xs.iter().filter(|&x| *x < *pivot).map(|x| x.clone()).collect()
 }
 
 fn larger_than<T: Clone + Ord>(xs: &[T], pivot: &T) -> Vec<T> {
-    return xs.iter().filter(|&x| *x > *pivot).map(|x| x.clone()).collect();
+    xs.iter().filter(|&x| *x > *pivot).map(|x| x.clone()).collect()
 }
 
 fn sortk<T: Clone + Ord>(x: &T, xs: &[T]) -> Vec<T> {

quickcheck_macros/COPYING

@@ -0,0 +1 @@
+../COPYING

quickcheck_macros/LICENSE-MIT

@@ -0,0 +1 @@
+../LICENSE-MIT

quickcheck_macros/UNLICENSE

@@ -0,0 +1 @@
+../UNLICENSE