OpenE2K
/
rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

iterator: work around method resolve bug (#5898)

This commit is contained in:
Daniel Micay 2013-06-07 14:45:31 -04:00
parent d945543ebf
commit 07e4d69baa
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/libstd/iterator.rs
View File

@ -285,7 +285,8 @@ pub trait IteratorUtil<A> {
/// let a = [1, 2, 3, 4, 5];
/// assert!(a.iter().last().get() == &5);
/// ~~~
fn last(&mut self) -> Option<A>;
// FIXME: #5898: should be called `last`
fn last_(&mut self) -> Option<A>;
/// Performs a fold operation over the entire iterator, returning the
/// eventual state at the end of the iteration.
@ -437,7 +438,7 @@ impl<A, T: Iterator<A>> IteratorUtil<A> for T {
/// Return the last item yielded by an iterator.
#[inline(always)]
fn last(&mut self) -> Option<A> {
fn last_(&mut self) -> Option<A> {
let mut last = None;
for self.advance |x| { last = Some(x); }
last
@ -1025,8 +1026,8 @@ mod tests {
#[test]
fn test_iterator_last() {
let v = &[0, 1, 2, 3, 4];
assert_eq!(v.iter().last().unwrap(), &4);
assert_eq!(v.slice(0, 1).iter().last().unwrap(), &0);
assert_eq!(v.iter().last_().unwrap(), &4);
assert_eq!(v.slice(0, 1).iter().last_().unwrap(), &0);
}
#[test]