From 1c9bf2f3a26eded043e73f41dbf7e54536744427 Mon Sep 17 00:00:00 2001 From: Diggory Hardy Date: Thu, 1 Mar 2018 17:05:15 +0000 Subject: [PATCH] Deprecate Rng::gen_iter --- src/lib.rs | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/lib.rs b/src/lib.rs index 131a493c5b..71f52847e0 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -601,6 +601,8 @@ pub trait Rng: RngCore + Sized { /// println!("{:?}", rng.gen_iter::<(f64, bool)>().take(5) /// .collect::>()); /// ``` + #[allow(deprecated)] + #[deprecated(since="0.5.0", note="replaced by Rng::iter")] fn gen_iter(&mut self) -> Generator where Uniform: Distribution { Generator { rng: self, _marker: marker::PhantomData } } @@ -884,11 +886,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 { rng: R, _marker: marker::PhantomData T>, } +#[allow(deprecated)] impl Iterator for Generator where Uniform: Distribution { type Item = T; @@ -1245,9 +1250,9 @@ mod test { #[test] fn test_gen_vec() { let mut r = rng(106); - assert_eq!(r.gen_iter::().take(0).count(), 0); - assert_eq!(r.gen_iter::().take(10).count(), 10); - assert_eq!(r.gen_iter::().take(16).count(), 16); + assert_eq!(r.iter().map(|rng| rng.gen::()).take(0).count(), 0); + assert_eq!(r.iter().map(|rng| rng.gen::()).take(10).count(), 10); + assert_eq!(r.iter().map(|rng| rng.gen::()).take(16).count(), 16); } #[test]