1
Fork 0

std: fix UnfoldrIterator cross-crate.

This commit is contained in:
Huon Wilson 2013-06-16 13:01:08 +10:00
parent c989b79127
commit 53f6a4e9fb
2 changed files with 36 additions and 2 deletions

View file

@ -788,8 +788,8 @@ 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(f: &'self fn(&mut St) -> Option<A>, initial_state: St)
-> UnfoldrIterator<'self, A, St> {
pub fn new<'a>(f: &'a fn(&mut St) -> Option<A>, initial_state: St)
-> UnfoldrIterator<'a, A, St> {
UnfoldrIterator {
f: f,
state: initial_state

View file

@ -0,0 +1,34 @@
// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution and at
// http://rust-lang.org/COPYRIGHT.
//
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
// option. This file may not be copied, modified, or distributed
// except according to those terms.
use std::iterator::*;
// UnfoldrIterator had a bug with 'self that mean it didn't work
// cross-crate
fn main() {
fn count(st: &mut uint) -> Option<uint> {
if *st < 10 {
let ret = Some(*st);
*st += 1;
ret
} else {
None
}
}
let mut it = UnfoldrIterator::new(count, 0);
let mut i = 0;
for it.advance |counted| {
assert_eq!(counted, i);
i += 1;
}
assert_eq!(i, 10);
}