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

Add intersperse and intersperse_with free functions #555

Merged
merged 1 commit into from Aug 16, 2021
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
37 changes: 36 additions & 1 deletion src/free.rs
Expand Up @@ -14,8 +14,8 @@ use alloc::{
string::String,
};

#[cfg(feature = "use_alloc")]
phimuemue marked this conversation as resolved.
Show resolved Hide resolved
use crate::Itertools;
use crate::intersperse::{Intersperse, IntersperseWith};

pub use crate::adaptors::{
interleave,
Expand All @@ -35,6 +35,41 @@ pub use crate::merge_join::merge_join_by;
#[cfg(feature = "use_alloc")]
pub use crate::rciter_impl::rciter;

/// Iterate `iterable` with a particular value inserted between each element.
///
/// [`IntoIterator`] enabled version of [`Iterator::intersperse`].
///
/// ```
/// use itertools::intersperse;
///
/// itertools::assert_equal(intersperse((0..3), 8), vec![0, 8, 1, 8, 2]);
/// ```
pub fn intersperse<I>(iterable: I, element: I::Item) -> Intersperse<I::IntoIter>
where I: IntoIterator,
<I as IntoIterator>::Item: Clone
{
Itertools::intersperse(iterable.into_iter(), element)
zertosh marked this conversation as resolved.
Show resolved Hide resolved
}

/// Iterate `iterable` with a particular value created by a function inserted
/// between each element.
///
/// [`IntoIterator`] enabled version of [`Iterator::intersperse_with`].
///
/// ```
/// use itertools::intersperse_with;
///
/// let mut i = 10;
/// itertools::assert_equal(intersperse_with((0..3), || { i -= 1; i }), vec![0, 9, 1, 8, 2]);
/// assert_eq!(i, 8);
/// ```
pub fn intersperse_with<I, F>(iterable: I, element: F) -> IntersperseWith<I::IntoIter, F>
where I: IntoIterator,
F: FnMut() -> I::Item
{
Itertools::intersperse_with(iterable.into_iter(), element)
}

/// Iterate `iterable` with a running index.
///
/// [`IntoIterator`] enabled version of [`Iterator::enumerate`].
Expand Down
19 changes: 19 additions & 0 deletions tests/test_core.rs
Expand Up @@ -9,6 +9,8 @@ use core::iter;
use itertools as it;
use crate::it::Itertools;
use crate::it::interleave;
use crate::it::intersperse;
use crate::it::intersperse_with;
use crate::it::multizip;
use crate::it::free::put_back;
use crate::it::iproduct;
Expand Down Expand Up @@ -136,6 +138,23 @@ fn test_interleave() {
it::assert_equal(it, rs.iter());
}

#[test]
fn test_intersperse() {
let xs = [1u8, 2, 3];
let ys = [1u8, 0, 2, 0, 3];
let it = intersperse(&xs, &0);
it::assert_equal(it, ys.iter());
}

#[test]
fn test_intersperse_with() {
let xs = [1u8, 2, 3];
let ys = [1u8, 10, 2, 10, 3];
let i = 10;
let it = intersperse_with(&xs, || &i);
it::assert_equal(it, ys.iter());
}

#[allow(deprecated)]
#[test]
fn foreach() {
Expand Down