From 7c369ee7337cee50f8ef05b9d2833e2aa30d802e Mon Sep 17 00:00:00 2001
From: blake2-ppc <blake2-ppc>
Date: Sun, 1 Sep 2013 18:20:24 +0200
Subject: [PATCH] std/extra: Add ExactSize for Bitv, DList, RingBuf, Option
 iterators

---
 src/libextra/bitv.rs    | 2 ++
 src/libextra/dlist.rs   | 3 +++
 src/libextra/ringbuf.rs | 4 ++++
 src/libstd/option.rs    | 4 +++-
 4 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/libextra/bitv.rs b/src/libextra/bitv.rs
index 63d62bd48098..03588d984d91 100644
--- a/src/libextra/bitv.rs
+++ b/src/libextra/bitv.rs
@@ -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 {
diff --git a/src/libextra/dlist.rs b/src/libextra/dlist.rs
index 8e6410736378..075a0fa77770 100644
--- a/src/libextra/dlist.rs
+++ b/src/libextra/dlist.rs
@@ -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> {
diff --git a/src/libextra/ringbuf.rs b/src/libextra/ringbuf.rs
index 4f2755374af0..9ae9b47e2076 100644
--- a/src/libextra/ringbuf.rs
+++ b/src/libextra/ringbuf.rs
@@ -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>]) {
diff --git a/src/libstd/option.rs b/src/libstd/option.rs
index f99a595f2eb8..dd66630187db 100644
--- a/src/libstd/option.rs
+++ b/src/libstd/option.rs
@@ -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::*;