aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Gallant <jamslam@gmail.com>2018-08-25 10:34:14 -0400
committerAndrew Gallant <jamslam@gmail.com>2018-08-25 10:34:14 -0400
commitb22bff6edfc55d2a53467d4fe3c73d5127877742 (patch)
tree114378c1f3f5d91a653b1a32dfbae2e3289e701a
parent915c7c532504a8a70b4d890e1671ba5288bc064a (diff)
downloadbyteorder-b22bff6edfc55d2a53467d4fe3c73d5127877742.tar.gz
deps: more updates in test code for rand 0.4 -> 0.5
-rw-r--r--benches/bench.rs25
-rw-r--r--src/lib.rs2
2 files changed, 18 insertions, 9 deletions
diff --git a/benches/bench.rs b/benches/bench.rs
index 8233a07..3982476 100644
--- a/benches/bench.rs
+++ b/benches/bench.rs
@@ -261,12 +261,15 @@ macro_rules! bench_slice {
use byteorder::{ByteOrder, BigEndian, LittleEndian};
use rand::{self, Rng};
+ use rand::distributions;
use test::Bencher;
#[bench]
fn read_big_endian(b: &mut Bencher) {
- let mut numbers: Vec<$numty> =
- rand::thread_rng().gen_iter().take(100000).collect();
+ let mut numbers: Vec<$numty> = rand::thread_rng()
+ .sample_iter(&distributions::Standard)
+ .take(100000)
+ .collect();
let mut bytes = vec![0; numbers.len() * size_of::<$numty>()];
BigEndian::$write(&numbers, &mut bytes);
@@ -278,8 +281,10 @@ macro_rules! bench_slice {
#[bench]
fn read_little_endian(b: &mut Bencher) {
- let mut numbers: Vec<$numty> =
- rand::thread_rng().gen_iter().take(100000).collect();
+ let mut numbers: Vec<$numty> = rand::thread_rng()
+ .sample_iter(&distributions::Standard)
+ .take(100000)
+ .collect();
let mut bytes = vec![0; numbers.len() * size_of::<$numty>()];
LittleEndian::$write(&numbers, &mut bytes);
@@ -291,8 +296,10 @@ macro_rules! bench_slice {
#[bench]
fn write_big_endian(b: &mut Bencher) {
- let numbers: Vec<$numty> =
- rand::thread_rng().gen_iter().take(100000).collect();
+ let numbers: Vec<$numty> = rand::thread_rng()
+ .sample_iter(&distributions::Standard)
+ .take(100000)
+ .collect();
let mut bytes = vec![0; numbers.len() * size_of::<$numty>()];
b.bytes = bytes.len() as u64;
@@ -303,8 +310,10 @@ macro_rules! bench_slice {
#[bench]
fn write_little_endian(b: &mut Bencher) {
- let numbers: Vec<$numty> =
- rand::thread_rng().gen_iter().take(100000).collect();
+ let numbers: Vec<$numty> = rand::thread_rng()
+ .sample_iter(&distributions::Standard)
+ .take(100000)
+ .collect();
let mut bytes = vec![0; numbers.len() * size_of::<$numty>()];
b.bytes = bytes.len() as u64;
diff --git a/src/lib.rs b/src/lib.rs
index fe3808f..77bfdcf 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -2306,7 +2306,7 @@ mod test {
extern crate rand;
use self::quickcheck::{QuickCheck, StdGen, Testable};
- use self::rand::thread_rng;
+ use self::rand::{Rng, thread_rng};
#[cfg(feature = "i128")] use self::quickcheck::{Arbitrary, Gen};
pub const U24_MAX: u32 = 16_777_215;