auto merge of #7177 : huonw/rust/unfold-fix, r=thestinger
This commit is contained in:
commit
fd8aa9afbd
2 changed files with 36 additions and 2 deletions
|
@ -816,8 +816,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
|
||||
|
|
34
src/test/run-pass/unfoldr-cross-crate.rs
Normal file
34
src/test/run-pass/unfoldr-cross-crate.rs
Normal 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);
|
||||
}
|
Loading…
Reference in a new issue