Skip to content

Commit 17c1229

Browse files
author
blake2-ppc
committed
---
yaml --- r: 86015 b: refs/heads/dist-snap c: 7c369ee h: refs/heads/master i: 86013: a797a98 86011: 2ef94f7 86007: d5965b5 85999: c23bc78 85983: 6642fa3 85951: ce650e6 85887: f00e975 85759: dd24a35 85503: 0df99a1 84991: 97420ac 83967: 3377006 81919: 274cca6 v: v3
1 parent 20dd3f0 commit 17c1229

File tree

5 files changed

+13
-2
lines changed

5 files changed

+13
-2
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ refs/heads/try: 0983ebe5310d4eb6d289f636f7ed0536c08bbc0e
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
9-
refs/heads/dist-snap: 35040dfccc6674e8eda71b34a8cd1b4cc1b45842
9+
refs/heads/dist-snap: 7c369ee7337cee50f8ef05b9d2833e2aa30d802e
1010
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1111
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
1212
refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

branches/dist-snap/src/libextra/bitv.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -608,6 +608,8 @@ impl<'self> DoubleEndedIterator<bool> for BitvIterator<'self> {
608608
}
609609
}
610610

611+
impl<'self> ExactSize<bool> for BitvIterator<'self> {}
612+
611613
impl<'self> RandomAccessIterator<bool> for BitvIterator<'self> {
612614
#[inline]
613615
fn indexable(&self) -> uint {

branches/dist-snap/src/libextra/dlist.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -472,6 +472,8 @@ impl<'self, A> DoubleEndedIterator<&'self A> for DListIterator<'self, A> {
472472
}
473473
}
474474

475+
impl<'self, A> ExactSize<&'self A> for DListIterator<'self, A> {}
476+
475477
impl<'self, A> Iterator<&'self mut A> for MutDListIterator<'self, A> {
476478
#[inline]
477479
fn next(&mut self) -> Option<&'self mut A> {
@@ -508,6 +510,7 @@ impl<'self, A> DoubleEndedIterator<&'self mut A> for MutDListIterator<'self, A>
508510
}
509511
}
510512

513+
impl<'self, A> ExactSize<&'self mut A> for MutDListIterator<'self, A> {}
511514

512515
/// Allow mutating the DList while iterating
513516
pub trait ListInsertion<A> {

branches/dist-snap/src/libextra/ringbuf.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -243,6 +243,8 @@ pub struct RingBufIterator<'self, T> {
243243
iterator!{impl RingBufIterator -> &'self T, get_ref}
244244
iterator_rev!{impl RingBufIterator -> &'self T, get_ref}
245245

246+
impl<'self, T> ExactSize<&'self T> for RingBufIterator<'self, T> {}
247+
246248
impl<'self, T> RandomAccessIterator<&'self T> for RingBufIterator<'self, T> {
247249
#[inline]
248250
fn indexable(&self) -> uint { self.rindex - self.index }
@@ -268,6 +270,8 @@ pub struct RingBufMutIterator<'self, T> {
268270
iterator!{impl RingBufMutIterator -> &'self mut T, get_mut_ref}
269271
iterator_rev!{impl RingBufMutIterator -> &'self mut T, get_mut_ref}
270272

273+
impl<'self, T> ExactSize<&'self mut T> for RingBufMutIterator<'self, T> {}
274+
271275
/// Grow is only called on full elts, so nelts is also len(elts), unlike
272276
/// elsewhere.
273277
fn grow<T>(nelts: uint, loptr: &mut uint, elts: &mut ~[Option<T>]) {

branches/dist-snap/src/libstd/option.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ use cmp::{Eq,Ord};
4646
use util;
4747
use num::Zero;
4848
use iterator;
49-
use iterator::{Iterator, DoubleEndedIterator};
49+
use iterator::{Iterator, DoubleEndedIterator, ExactSize};
5050
use str::{StrSlice, OwnedStr};
5151
use to_str::ToStr;
5252
use clone::DeepClone;
@@ -402,6 +402,8 @@ impl<A> DoubleEndedIterator<A> for OptionIterator<A> {
402402
}
403403
}
404404

405+
impl<A> ExactSize<A> for OptionIterator<A> {}
406+
405407
#[cfg(test)]
406408
mod tests {
407409
use super::*;

0 commit comments

Comments
 (0)