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

std/extra: Add ExactSize for Bitv, DList, RingBuf, Option iterators

Browse Source
This commit is contained in:
blake2-ppc 2013-09-01 18:20:24 +02:00
parent 35040dfccc
commit 7c369ee733
4 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/libextra/bitv.rs
View File

@ -608,6 +608,8 @@ impl<'self> DoubleEndedIterator<bool> for BitvIterator<'self> {
}
}
impl<'self> ExactSize<bool> for BitvIterator<'self> {}
impl<'self> RandomAccessIterator<bool> for BitvIterator<'self> {
#[inline]
fn indexable(&self) -> uint {

3
src/libextra/dlist.rs
View File

@ -472,6 +472,8 @@ impl<'self, A> DoubleEndedIterator<&'self A> for DListIterator<'self, A> {
}
}
impl<'self, A> ExactSize<&'self A> for DListIterator<'self, A> {}
impl<'self, A> Iterator<&'self mut A> for MutDListIterator<'self, A> {
#[inline]
fn next(&mut self) -> Option<&'self mut A> {
@ -508,6 +510,7 @@ impl<'self, A> DoubleEndedIterator<&'self mut A> for MutDListIterator<'self, A>
}
}
impl<'self, A> ExactSize<&'self mut A> for MutDListIterator<'self, A> {}
/// Allow mutating the DList while iterating
pub trait ListInsertion<A> {

4
src/libextra/ringbuf.rs
View File

@ -243,6 +243,8 @@ pub struct RingBufIterator<'self, T> {
iterator!{impl RingBufIterator -> &'self T, get_ref}
iterator_rev!{impl RingBufIterator -> &'self T, get_ref}
impl<'self, T> ExactSize<&'self T> for RingBufIterator<'self, T> {}
impl<'self, T> RandomAccessIterator<&'self T> for RingBufIterator<'self, T> {
#[inline]
fn indexable(&self) -> uint { self.rindex - self.index }
@ -268,6 +270,8 @@ pub struct RingBufMutIterator<'self, T> {
iterator!{impl RingBufMutIterator -> &'self mut T, get_mut_ref}
iterator_rev!{impl RingBufMutIterator -> &'self mut T, get_mut_ref}
impl<'self, T> ExactSize<&'self mut T> for RingBufMutIterator<'self, T> {}
/// Grow is only called on full elts, so nelts is also len(elts), unlike
/// elsewhere.
fn grow<T>(nelts: uint, loptr: &mut uint, elts: &mut ~[Option<T>]) {

4
src/libstd/option.rs
View File

@ -46,7 +46,7 @@ use cmp::{Eq,Ord};
use util;
use num::Zero;
use iterator;
use iterator::{Iterator, DoubleEndedIterator};
use iterator::{Iterator, DoubleEndedIterator, ExactSize};
use str::{StrSlice, OwnedStr};
use to_str::ToStr;
use clone::DeepClone;
@ -402,6 +402,8 @@ impl<A> DoubleEndedIterator<A> for OptionIterator<A> {
}
}
impl<A> ExactSize<A> for OptionIterator<A> {}
#[cfg(test)]
mod tests {
use super::*;