Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 16 additions & 1 deletion src/libstd/vec.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2125,7 +2125,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)
}
}
Expand Down Expand Up @@ -3404,6 +3409,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::*;
Expand Down