Skip to content

additional iterator traits for Take + Repeat/RepeatWith #114513

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
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: 28 additions & 1 deletion library/core/src/iter/adapters/take.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
use crate::cmp;
use crate::iter::{adapters::SourceIter, FusedIterator, InPlaceIterable, TrustedLen};
use crate::iter::{
adapters::SourceIter, FusedIterator, InPlaceIterable, Repeat, RepeatWith, TrustedLen,
};
use crate::num::NonZeroUsize;
use crate::ops::{ControlFlow, Try};

Expand Down Expand Up @@ -241,9 +243,34 @@ where
}
}

#[stable(feature = "double_ended_repeat_take_iterator", since = "CURRENT_RUSTC_VERSION")]
impl<T: Clone> DoubleEndedIterator for Take<Repeat<T>> {
fn next_back(&mut self) -> Option<Self::Item> {
if self.n == 0 {
None
} else {
self.n -= 1;
self.iter.next()
}
}

fn advance_back_by(&mut self, n: usize) -> Result<(), NonZeroUsize> {
let advanced = self.n.min(n);
self.n -= advanced;
let remainder = n - advanced;
NonZeroUsize::new(remainder).map_or(Ok(()), Err)
}
}

#[stable(feature = "rust1", since = "1.0.0")]
impl<I> ExactSizeIterator for Take<I> where I: ExactSizeIterator {}

#[stable(feature = "take_repeat_exactsize", since = "CURRENT_RUSTC_VERSION")]
impl<T: Clone> ExactSizeIterator for Take<Repeat<T>> {}

#[stable(feature = "take_repeat_with_exactsize", since = "CURRENT_RUSTC_VERSION")]
impl<T, F> ExactSizeIterator for Take<RepeatWith<F>> where F: FnMut() -> T {}

#[stable(feature = "fused", since = "1.26.0")]
impl<I> FusedIterator for Take<I> where I: FusedIterator {}

Expand Down
19 changes: 19 additions & 0 deletions library/core/tests/iter/adapters/take.rs
Original file line number Diff line number Diff line change
Expand Up @@ -167,3 +167,22 @@ fn test_byref_take_consumed_items() {
assert_eq!(count, 70);
assert_eq!(inner, 90..90);
}

#[test]
fn test_take_repeat_double_ended() {
let mut iter = repeat(0).take(100);
assert_eq!(iter.len(), 100);
assert_eq!(iter.next(), Some(0));
assert_eq!(iter.next_back(), Some(0));
assert_eq!(iter.advance_by(1), Ok(()));
assert_eq!(iter.advance_back_by(1), Ok(()));
assert_eq!(iter.len(), 96);
}

#[test]
fn test_take_repeat_with_exact_size() {
let mut iter = repeat_with(|| 0).take(100);
assert_eq!(iter.len(), 100);
assert_eq!(iter.advance_by(100), Ok(()));
assert_eq!(iter.len(), 0);
}