Convert std::rand::Rng::gen_iter to sample_iter

chalharu · May 26, 2018 · 6c3acc9 · 6c3acc9
1 parent 16764ae
commit 6c3acc9
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 17 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -23,7 +23,7 @@ cfg-if = ">0.0.0"
 
 [dev-dependencies]
 simple_logger = { version = ">=0.0.0" }
-rand = ">=0.0.0"
+rand = ">=0.5.0"
 
 [features]
 default = [ "std", "bzip2", "gzip", "deflate", "zlib" ]

diff --git a/src/deflate/mod.rs b/src/deflate/mod.rs
@@ -130,6 +130,7 @@ mod tests {
     use deflate::decoder::Deflater;
     use deflate::encoder::Inflater;
     use rand::{Rng, SeedableRng, XorShiftRng};
+    use rand::distributions::Standard;
     use traits::decoder::DecodeExt;
     use traits::encoder::EncodeExt;
 
@@ -185,7 +186,7 @@ mod tests {
             0x51, 0x6D, 0x3E, 0xA2, 0xF3,
         ]);
 
-        check(&(rng.gen_iter().take(323_742).collect::<Vec<_>>()));
+        check(&(rng.sample_iter(&Standard).take(323_742).collect::<Vec<_>>()));
     }
 
     #[test]
@@ -195,7 +196,7 @@ mod tests {
             0x51, 0x6D, 0x3E, 0xA2, 0xF3,
         ]);
 
-        check(&(rng.gen_iter().take(323_742).collect::<Vec<_>>()));
+        check(&(rng.sample_iter(&Standard).take(323_742).collect::<Vec<_>>()));
     }
 
     #[test]
@@ -206,7 +207,7 @@ mod tests {
         ]);
 
         check(
-            &(rng.gen_iter()
+            &(rng.sample_iter(&Standard)
                 .take(0xF_FFFF)
                 .collect::<Vec<_>>()),
         );
@@ -218,7 +219,7 @@ mod tests {
             0x51, 0x6D, 0x3E, 0xA2, 0xF3,
         ]);
 
-        check(&(rng.gen_iter().take(len).collect::<Vec<_>>()));
+        check(&(rng.sample_iter(&Standard).take(len).collect::<Vec<_>>()));
     }
 
     #[test]

diff --git a/src/gzip/mod.rs b/src/gzip/mod.rs
@@ -17,6 +17,7 @@ mod tests {
     use gzip::decoder::GZipDecoder;
     use gzip::encoder::GZipEncoder;
     use rand::{Rng, SeedableRng, XorShiftRng};
+    use rand::distributions::Standard;
     use traits::decoder::DecodeExt;
     use traits::encoder::EncodeExt;
 
@@ -72,7 +73,7 @@ mod tests {
             0x51, 0x6D, 0x3E, 0xA2, 0xF3,
         ]);
 
-        check(&(rng.gen_iter().take(323_742).collect::<Vec<_>>()));
+        check(&(rng.sample_iter(&Standard).take(323_742).collect::<Vec<_>>()));
     }
 
     #[test]
@@ -82,7 +83,7 @@ mod tests {
             0x51, 0x6D, 0x3E, 0xA2, 0xF3,
         ]);
 
-        check(&(rng.gen_iter().take(323_742).collect::<Vec<_>>()));
+        check(&(rng.sample_iter(&Standard).take(323_742).collect::<Vec<_>>()));
     }
 
     #[test]
@@ -93,7 +94,7 @@ mod tests {
         ]);
 
         check(
-            &(rng.gen_iter()
+            &(rng.sample_iter(&Standard)
                 .take(0xF_FFFF)
                 .collect::<Vec<_>>()),
         );
@@ -105,7 +106,7 @@ mod tests {
             0x51, 0x6D, 0x3E, 0xA2, 0xF3,
         ]);
 
-        check(&(rng.gen_iter().take(len).collect::<Vec<_>>()));
+        check(&(rng.sample_iter(&Standard).take(len).collect::<Vec<_>>()));
     }
 
     #[test]

diff --git a/src/lzhuf/mod.rs b/src/lzhuf/mod.rs
@@ -45,6 +45,7 @@ mod tests {
     use lzhuf::decoder::LzhufDecoder;
     use lzhuf::encoder::LzhufEncoder;
     use rand::{Rng, SeedableRng, XorShiftRng};
+    use rand::distributions::Standard;
     use traits::decoder::DecodeExt;
     use traits::encoder::EncodeExt;
 
@@ -101,7 +102,7 @@ mod tests {
             0x51, 0x6D, 0x3E, 0xA2, 0xF3,
         ]);
 
-        check(&(rng.gen_iter().take(323_742).collect::<Vec<_>>()));
+        check(&(rng.sample_iter(&Standard).take(323_742).collect::<Vec<_>>()));
     }
 
     #[test]
@@ -111,7 +112,7 @@ mod tests {
             0x51, 0x6D, 0x3E, 0xA2, 0xF3,
         ]);
 
-        check(&(rng.gen_iter().take(323_742).collect::<Vec<_>>()));
+        check(&(rng.sample_iter(&Standard).take(323_742).collect::<Vec<_>>()));
     }
 
     #[test]
@@ -122,7 +123,7 @@ mod tests {
         ]);
 
         check(
-            &(rng.gen_iter()
+            &(rng.sample_iter(&Standard)
                 .take(0xF_FFFF)
                 .collect::<Vec<_>>()),
         );
@@ -134,7 +135,7 @@ mod tests {
             0x51, 0x6D, 0x3E, 0xA2, 0xF3,
         ]);
 
-        check(&(rng.gen_iter().take(len).collect::<Vec<_>>()));
+        check(&(rng.sample_iter(&Standard).take(len).collect::<Vec<_>>()));
     }
 
     #[test]

diff --git a/src/zlib/mod.rs b/src/zlib/mod.rs
@@ -15,6 +15,7 @@ mod tests {
     #[cfg(not(feature = "std"))]
     use alloc::vec::Vec;
     use rand::{Rng, SeedableRng, XorShiftRng};
+    use rand::distributions::Standard;
     use traits::decoder::DecodeExt;
     use traits::encoder::EncodeExt;
     use zlib::decoder::ZlibDecoder;
@@ -72,7 +73,7 @@ mod tests {
             0x51, 0x6D, 0x3E, 0xA2, 0xF3,
         ]);
 
-        check(&(rng.gen_iter().take(323_742).collect::<Vec<_>>()));
+        check(&(rng.sample_iter(&Standard).take(323_742).collect::<Vec<_>>()));
     }
 
     #[test]
@@ -82,7 +83,7 @@ mod tests {
             0x51, 0x6D, 0x3E, 0xA2, 0xF3,
         ]);
 
-        check(&(rng.gen_iter().take(323_742).collect::<Vec<_>>()));
+        check(&(rng.sample_iter(&Standard).take(323_742).collect::<Vec<_>>()));
     }
 
     #[test]
@@ -93,7 +94,7 @@ mod tests {
         ]);
 
         check(
-            &(rng.gen_iter()
+            &(rng.sample_iter(&Standard)
                 .take(0xF_FFFF)
                 .collect::<Vec<_>>()),
         );
@@ -105,7 +106,7 @@ mod tests {
             0x51, 0x6D, 0x3E, 0xA2, 0xF3,
         ]);
 
-        check(&(rng.gen_iter().take(len).collect::<Vec<_>>()));
+        check(&(rng.sample_iter(&Standard).take(len).collect::<Vec<_>>()));
     }
 
     #[test]