Skip to content
Closed
Show file tree
Hide file tree
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
29 changes: 29 additions & 0 deletions src/liballoc/tests/vec.rs
Original file line number Diff line number Diff line change
Expand Up @@ -697,11 +697,40 @@ fn test_into_iter_debug() {
assert_eq!(debug, "IntoIter(['a', 'b', 'c'])");
}

#[test]
fn test_into_iter_len() {
let mut into_iter = vec![1, 2, 3].into_iter();
assert_eq!(into_iter.len(), 3);
into_iter.next();
assert_eq!(into_iter.len(), 2);
}

#[test]
fn test_into_iter_count() {
assert_eq!(vec![1, 2, 3].into_iter().count(), 3);
}

#[test]
fn test_into_iter_nth() {
let mut into_iter = vec![1, 2, 3, 4, 5, 6, 7, 8, 9, 10].into_iter();
assert_eq!(into_iter.nth(0), Some(1));
assert_eq!(into_iter.nth(2), Some(4));
assert_eq!(into_iter.nth(1), Some(6));
assert_eq!(into_iter.nth(3), Some(10));
assert_eq!(into_iter.nth(3), None);
assert_eq!(into_iter.nth(3), None);
}

#[test]
fn test_into_iter_next_back() {
let mut into_iter = vec![1, 2, 3].into_iter();
assert_eq!(into_iter.next_back(), Some(3));
assert_eq!(into_iter.next_back(), Some(2));
assert_eq!(into_iter.next_back(), Some(1));
assert_eq!(into_iter.next_back(), None);
assert_eq!(into_iter.next_back(), None);
}

#[test]
fn test_into_iter_clone() {
fn iter_equal<I: Iterator<Item = i32>>(it: I, slice: &[i32]) {
Expand Down
19 changes: 14 additions & 5 deletions src/liballoc/vec.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2340,18 +2340,19 @@ impl<T> Iterator for IntoIter<T> {

#[inline]
fn size_hint(&self) -> (usize, Option<usize>) {
let exact = if mem::size_of::<T>() == 0 {
(self.end as usize).wrapping_sub(self.ptr as usize)
} else {
unsafe { self.end.offset_from(self.ptr) as usize }
};
let exact = self.len();
(exact, Some(exact))
}

#[inline]
fn count(self) -> usize {
self.len()
}

#[inline]
fn last(mut self) -> Option<T> {
self.next_back()
}
}

#[stable(feature = "rust1", since = "1.0.0")]
Expand Down Expand Up @@ -2380,6 +2381,14 @@ impl<T> DoubleEndedIterator for IntoIter<T> {

#[stable(feature = "rust1", since = "1.0.0")]
impl<T> ExactSizeIterator for IntoIter<T> {
fn len(&self) -> usize {
if mem::size_of::<T>() == 0 {
(self.end as usize).wrapping_sub(self.ptr as usize)
} else {
unsafe { self.end.offset_from(self.ptr) as usize }
}
}

fn is_empty(&self) -> bool {
self.ptr == self.end
}
Expand Down