Merge pull request #435 from dhardy/reorg

Reorganisation of Rand items

Author: dhardy

benches/generators.rs

@@ -9,12 +9,11 @@ const BYTES_LEN: usize = 1024;
 use std::mem::size_of;
 use test::{black_box, Bencher};
 
-use rand::{RngCore, Rng, SeedableRng, FromEntropy};
-use rand::{StdRng, SmallRng, OsRng, EntropyRng, ReseedingRng};
+use rand::prelude::*;
 use rand::prng::{XorShiftRng, Hc128Rng, IsaacRng, Isaac64Rng, ChaChaRng};
 use rand::prng::hc128::Hc128Core;
-use rand::jitter::JitterRng;
-use rand::thread_rng;
+use rand::rngs::adaptor::ReseedingRng;
+use rand::rngs::{OsRng, JitterRng, EntropyRng};
 
 macro_rules! gen_bytes {
     ($fnn:ident, $gen:expr) => {

benches/misc.rs

@@ -7,7 +7,7 @@ const RAND_BENCH_N: u64 = 1000;
 
 use test::{black_box, Bencher};
 
-use rand::{SeedableRng, SmallRng, Rng, thread_rng};
+use rand::prelude::*;
 use rand::seq::*;
 
 #[bench]