mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dlist: Fix .peek_next() w.r.t double ended iterators

Browse Source 
.peek_next() needs to check the element counter just like the .next()
and .next_back() iterators do.

Also clarify .insert_next() doc w.r.t double ended iteration.
This commit is contained in:
blake2-ppc 2013-07-22 17:51:11 +02:00
parent cf437a2730
commit 52b4a2eb6f
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/libextra/dlist.rs
View File

@ -477,7 +477,9 @@ impl<'self, A> DoubleEndedIterator<&'self mut A> for MutDListIterator<'self, A>
/// Allow mutating the DList while iterating
pub trait ListInsertion<A> {
/// Insert `elt` just after to the most recently yielded element
/// Insert `elt` just after to the element most recently returned by `.next()`
///
/// The inserted element does not appear in the iteration.
fn insert_next(&mut self, elt: A);
/// Provide a reference to the next element, without changing the iterator
@ -515,6 +517,9 @@ impl<'self, A> ListInsertion<A> for MutDListIterator<'self, A> {
#[inline]
fn peek_next<'a>(&'a mut self) -> Option<&'a mut A> {
if self.nelem == 0 {
return None
}
self.head.resolve().map_consume(|head| &mut head.value)
}
}