From b9cf6a33d2b5c0006f780c01bcaae4047551eb75 Mon Sep 17 00:00:00 2001 From: blake2-ppc Date: Fri, 28 Jun 2013 13:52:37 +0200 Subject: iterator: UnfoldrIterator::new should have function argument last To match Rust conventions and enable use of `do` etc, make sure the closure is the last argument to the `new` method. --- src/libstd/iterator.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/libstd/iterator.rs') diff --git a/src/libstd/iterator.rs b/src/libstd/iterator.rs index 78940143f4e..765bf3b36f2 100644 --- a/src/libstd/iterator.rs +++ b/src/libstd/iterator.rs @@ -983,7 +983,7 @@ impl<'self, A, St> UnfoldrIterator<'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>(f: &'a fn(&mut St) -> Option, initial_state: St) + pub fn new<'a>(initial_state: St, f: &'a fn(&mut St) -> Option) -> UnfoldrIterator<'a, A, St> { UnfoldrIterator { f: f, @@ -1174,7 +1174,7 @@ mod tests { } } - let mut it = UnfoldrIterator::new(count, 0); + let mut it = UnfoldrIterator::new(0, count); let mut i = 0; for it.advance |counted| { assert_eq!(counted, i); -- cgit 1.4.1-3-g733a5