nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-26 08:44:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Auto merge of #31225 - mbrubeck:btreeset-size-hint, r=Gankro

Browse Source 
None
This commit is contained in:
bors 2016-01-28 02:21:58 +00:00
commit 1c06f64ac2
1 changed files with 27 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/libcollections/btree/set.rs
View File

@ -12,6 +12,7 @@
// to TreeMap
use core::cmp::Ordering::{self, Less, Greater, Equal};
use core::cmp::{min, max};
use core::fmt::Debug;
use core::fmt;
use core::iter::{Peekable, FromIterator};
@ -703,7 +704,9 @@ impl<'a, T> DoubleEndedIterator for Iter<'a, T> {
}
}
#[stable(feature = "rust1", since = "1.0.0")]
impl<'a, T> ExactSizeIterator for Iter<'a, T> {}
impl<'a, T> ExactSizeIterator for Iter<'a, T> {
fn len(&self) -> usize { self.iter.len() }
}
#[stable(feature = "rust1", since = "1.0.0")]
@ -724,7 +727,9 @@ impl<T> DoubleEndedIterator for IntoIter<T> {
}
}
#[stable(feature = "rust1", since = "1.0.0")]
impl<T> ExactSizeIterator for IntoIter<T> {}
impl<T> ExactSizeIterator for IntoIter<T> {
fn len(&self) -> usize { self.iter.len() }
}
impl<'a, T> Clone for Range<'a, T> {
@ -780,6 +785,12 @@ impl<'a, T: Ord> Iterator for Difference<'a, T> {
}
}
}
fn size_hint(&self) -> (usize, Option<usize>) {
let a_len = self.a.len();
let b_len = self.b.len();
(a_len.saturating_sub(b_len), Some(a_len))
}
}
impl<'a, T> Clone for SymmetricDifference<'a, T> {
@ -806,6 +817,10 @@ impl<'a, T: Ord> Iterator for SymmetricDifference<'a, T> {
}
}
}
fn size_hint(&self) -> (usize, Option<usize>) {
(0, Some(self.a.len() + self.b.len()))
}
}
impl<'a, T> Clone for Intersection<'a, T> {
@ -842,6 +857,10 @@ impl<'a, T: Ord> Iterator for Intersection<'a, T> {
}
}
}
fn size_hint(&self) -> (usize, Option<usize>) {
(0, Some(min(self.a.len(), self.b.len())))
}
}
impl<'a, T> Clone for Union<'a, T> {
@ -868,4 +887,10 @@ impl<'a, T: Ord> Iterator for Union<'a, T> {
}
}
}
fn size_hint(&self) -> (usize, Option<usize>) {
let a_len = self.a.len();
let b_len = self.b.len();
(max(a_len, b_len), Some(a_len + b_len))
}
}