update rand usage

Author: alecmocatta

Cargo.toml

@@ -22,5 +22,5 @@ maintenance = { status = "actively-developed" }
 twox-hash = "1.1"
 serde_derive = "1.0"
 serde = { version = "1.0", features = ["derive"] }
-rand = "0.7"
+rand = { version = "0.7", features = ["small_rng"] }
 packed_simd = { version = "0.3", features = ["into_bits"] }

src/sample.rs

@@ -184,7 +184,7 @@ impl<T> ops::AddAssign for SampleUnstable<T> {
 			assert_eq!(self.reservoir.capacity(), other.reservoir.capacity());
 			let mut new = FixedCapVec::new(self.reservoir.capacity());
 			let (m, n) = (self.i, other.i);
-			let mut rng = rand::prng::XorShiftRng::from_seed([
+			let mut rng = rand::rngs::SmallRng::from_seed([
 				u8::try_from(m & 0xff).unwrap(),
 				u8::try_from(n & 0xff).unwrap(),
 				u8::try_from(self.reservoir.capacity() & 0xff).unwrap(),

src/top.rs

@@ -308,9 +308,8 @@ mod test {
 
 	#[test]
 	fn abc() {
-		let mut rng = rand::prng::XorShiftRng::from_seed([
-			0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
-		]);
+		let mut rng =
+			rand::rngs::SmallRng::from_seed([0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15]);
 		let mut top = Top::<String, usize>::new(100, 0.99, 2.0 / 1000.0, ());
 		let mut x = HashMap::new();
 		for _ in 0..10_000 {
@@ -392,9 +391,8 @@ mod test {
 
 	#[test]
 	fn top_hll() {
-		let mut rng = rand::prng::XorShiftRng::from_seed([
-			0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
-		]);
+		let mut rng =
+			rand::rngs::SmallRng::from_seed([0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15]);
 		let mut top = Top::<String, HLL<String>>::new(1000, 0.99, 2.0 / 1000.0, 0.00408);
 		// let mut x = HashMap::new();
 		for _ in 0..5_000 {
@@ -422,9 +420,8 @@ mod test {
 	fn many() {
 		let start = time::Instant::now();
 
-		let mut rng = rand::prng::XorShiftRng::from_seed([
-			0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
-		]);
+		let mut rng =
+			rand::rngs::SmallRng::from_seed([0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15]);
 		let mut top = Top::<String, HLL<String>>::new(1000, 0.99, 2.0 / 1000.0, 0.05);
 		// let mut x = HashMap::new();
 		for _ in 0..5_000_000 {