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

Merge pull request #7565 from Blei/fix-rev-size-hint

Browse Source 
vec: Fix size_hint() of reverse iterators
This commit is contained in:
Daniel Micay 2013-07-03 22:07:20 -07:00
commit dd4f6bb2a2
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/libstd/vec.rs
View File

@ -2025,7 +2025,12 @@ macro_rules! iterator {
#[inline]
fn size_hint(&self) -> (Option<uint>, Option<uint>) {
let exact = Some(((self.end as uint) - (self.ptr as uint)) / size_of::<$elem>());
let diff = if $step > 0 {
(self.end as uint) - (self.ptr as uint)
} else {
(self.ptr as uint) - (self.end as uint)
};
let exact = Some(diff / size_of::<$elem>());
(exact, exact)
}
}
@ -2977,6 +2982,16 @@ mod tests {
assert!(it.next().is_none());
}
#[test]
fn test_iter_size_hints() {
use iterator::*;
let mut xs = [1, 2, 5, 10, 11];
assert_eq!(xs.iter().size_hint(), (Some(5), Some(5)));
assert_eq!(xs.rev_iter().size_hint(), (Some(5), Some(5)));
assert_eq!(xs.mut_iter().size_hint(), (Some(5), Some(5)));
assert_eq!(xs.mut_rev_iter().size_hint(), (Some(5), Some(5)));
}
#[test]
fn test_mut_iterator() {
use iterator::*;