From 4c2b480aae2abb87e617076ee3f672f5c851d7d0 Mon Sep 17 00:00:00 2001 From: Huon Wilson Date: Sun, 8 Sep 2013 10:52:19 +1000 Subject: std: Rename Unfoldr to Unfold. The `r` is not relevant, since there is only one direction of folding (unlike Haskell). --- src/libstd/iterator.rs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/libstd/iterator.rs') diff --git a/src/libstd/iterator.rs b/src/libstd/iterator.rs index db67a624a9b..77637b6998e 100644 --- a/src/libstd/iterator.rs +++ b/src/libstd/iterator.rs @@ -1672,26 +1672,26 @@ for Inspect<'self, A, T> { } /// An iterator which just modifies the contained state throughout iteration. -pub struct Unfoldr<'self, A, St> { +pub struct Unfold<'self, A, St> { priv f: &'self fn(&mut St) -> Option, /// Internal state that will be yielded on the next iteration state: St } -impl<'self, A, St> Unfoldr<'self, A, St> { +impl<'self, A, St> Unfold<'self, A, St> { /// Creates a new iterator with the specified closure as the "iterator /// function" and an initial state to eventually pass to the iterator #[inline] pub fn new<'a>(initial_state: St, f: &'a fn(&mut St) -> Option) - -> Unfoldr<'a, A, St> { - Unfoldr { + -> Unfold<'a, A, St> { + Unfold { f: f, state: initial_state } } } -impl<'self, A, St> Iterator for Unfoldr<'self, A, St> { +impl<'self, A, St> Iterator for Unfold<'self, A, St> { #[inline] fn next(&mut self) -> Option { (self.f)(&mut self.state) @@ -2213,7 +2213,7 @@ mod tests { } } - let mut it = Unfoldr::new(0, count); + let mut it = Unfold::new(0, count); let mut i = 0; for counted in it { assert_eq!(counted, i); -- cgit 1.4.1-3-g733a5