Skip to content
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

RepeatN: implement PeekingNext #855

Merged
Merged
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
14 changes: 14 additions & 0 deletions src/peeking_take_while.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
use crate::PutBack;
#[cfg(feature = "use_alloc")]
use crate::PutBackN;
use crate::RepeatN;
use std::iter::Peekable;

/// An iterator that allows peeking at an element before deciding to accept it.
Expand Down Expand Up @@ -91,6 +92,19 @@ where
}
}

impl<T: Clone> PeekingNext for RepeatN<T> {
fn peeking_next<F>(&mut self, accept: F) -> Option<Self::Item>
where
F: FnOnce(&Self::Item) -> bool,
{
let r = self.elt.as_ref()?;
if !accept(r) {
return None;
}
self.next()
}
}

/// An iterator adaptor that takes items while a closure returns `true`.
///
/// See [`.peeking_take_while()`](crate::Itertools::peeking_take_while)
Expand Down
2 changes: 1 addition & 1 deletion src/repeatn.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ use std::iter::FusedIterator;
#[must_use = "iterators are lazy and do nothing unless consumed"]
#[derive(Clone, Debug)]
pub struct RepeatN<A> {
elt: Option<A>,
pub(crate) elt: Option<A>,
n: usize,
}

Expand Down
16 changes: 16 additions & 0 deletions tests/test_std.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ use crate::it::izip;
use crate::it::multipeek;
use crate::it::multizip;
use crate::it::peek_nth;
use crate::it::repeat_n;
use crate::it::ExactlyOneError;
use crate::it::FoldWhile;
use crate::it::Itertools;
Expand Down Expand Up @@ -674,6 +675,21 @@ fn test_multipeek_peeking_next() {
assert_eq!(mp.peek(), None);
}

#[test]
fn test_repeat_n_peeking_next() {
Philippe-Cholet marked this conversation as resolved.
Show resolved Hide resolved
use crate::it::PeekingNext;
let mut rn = repeat_n(0, 5);
assert_eq!(rn.peeking_next(|&x| x != 0), None);
assert_eq!(rn.peeking_next(|&x| x <= 0), Some(0));
assert_eq!(rn.next(), Some(0));
assert_eq!(rn.peeking_next(|&x| x <= 0), Some(0));
assert_eq!(rn.peeking_next(|&x| x != 0), None);
assert_eq!(rn.peeking_next(|&x| x >= 0), Some(0));
assert_eq!(rn.next(), Some(0));
assert_eq!(rn.peeking_next(|&x| x <= 0), None);
assert_eq!(rn.next(), None);
}

#[test]
fn test_peek_nth() {
let nums = vec![1u8, 2, 3, 4, 5];
Expand Down