From 966f278d8c87d3719910672ca8dab590057e32fe Mon Sep 17 00:00:00 2001
From: Diggory Hardy <git@dhardy.name>
Date: Thu, 1 Mar 2018 17:05:15 +0000
Subject: [PATCH] Deprecate Rng::gen_iter

---
 benches/misc.rs |  1 +
 src/lib.rs      | 11 ++++++++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/benches/misc.rs b/benches/misc.rs
index 6c11c57673c..4f8ab4262d3 100644
--- a/benches/misc.rs
+++ b/benches/misc.rs
@@ -72,6 +72,7 @@ fn gen_1k_iter_repeat(b: &mut Bencher) {
     b.bytes = 1024;
 }
 
+#[allow(deprecated)]
 #[bench]
 fn gen_1k_gen_iter(b: &mut Bencher) {
     let mut rng = weak_rng();
diff --git a/src/lib.rs b/src/lib.rs
index 3424e0967b6..141d354440e 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -602,6 +602,8 @@ pub trait Rng: RngCore + Sized {
     /// println!("{:?}", rng.gen_iter::<(f64, bool)>().take(5)
     ///                     .collect::<Vec<(f64, bool)>>());
     /// ```
+    #[allow(deprecated)]
+    #[deprecated(since="0.5.0", note="replaced by Rng::iter")]
     fn gen_iter<T>(&mut self) -> Generator<T, &mut Self> where Uniform: Distribution<T> {
         Generator { rng: self, _marker: marker::PhantomData }
     }
@@ -891,11 +893,14 @@ impl_as_byte_slice_arrays!(32, N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N
 /// [`gen_iter`]: trait.Rng.html#method.gen_iter
 /// [`Rng`]: trait.Rng.html
 #[derive(Debug)]
+#[allow(deprecated)]
+#[deprecated(since="0.5.0", note="replaced by Rng::iter")]
 pub struct Generator<T, R: RngCore> {
     rng: R,
     _marker: marker::PhantomData<fn() -> T>,
 }
 
+#[allow(deprecated)]
 impl<T, R: RngCore> Iterator for Generator<T, R> where Uniform: Distribution<T> {
     type Item = T;
 
@@ -1252,9 +1257,9 @@ mod test {
     #[test]
     fn test_gen_vec() {
         let mut r = rng(106);
-        assert_eq!(r.gen_iter::<u8>().take(0).count(), 0);
-        assert_eq!(r.gen_iter::<u8>().take(10).count(), 10);
-        assert_eq!(r.gen_iter::<f64>().take(16).count(), 16);
+        assert_eq!(r.iter().map(|rng| rng.gen::<u8>()).take(0).count(), 0);
+        assert_eq!(r.iter().map(|rng| rng.gen::<u8>()).take(10).count(), 10);
+        assert_eq!(r.iter().map(|rng| rng.gen::<f64>()).take(16).count(), 16);
     }
 
     #[test]