Skip to content

Remove itertools dependency from the main crate and from the plot crate. #876

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.

Sign up for GitHub

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

Open
briansmith wants to merge 2 commits into
base: master
Choose a base branch
from
+64 −32
Open

Remove itertools dependency from the main crate and from the plot crate. #876

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fbcafec
Remove `itertools` dependency from the main crate.
briansmith Jul 10, 2025
b621bee
Remove itertools dependency from plot crate.
briansmith Jul 10, 2025
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
21 changes: 0 additions & 21 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ exclude = ["book/*"]
[dependencies]
anes = "0.1.4"
criterion-plot = { path = "plot", version = "0.5.0" }
itertools = "0.13"
serde = { version = "1.0.100", features = ["derive"] }
serde_json = "1.0.100"
ciborium = "0.2.0"
Expand Down
2 changes: 0 additions & 2 deletions plot/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,8 @@ license = "MIT OR Apache-2.0"

[dependencies]
cast = "0.3"
itertools = "0.13"

[dev-dependencies]
itertools-num = "0.1"
num-complex = { version = "0.4", default-features = false, features = ["std"] }
rand = "0.8"

Expand Down
3 changes: 2 additions & 1 deletion plot/src/candlestick.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
use std::borrow::Cow;

use crate::data::Matrix;
use crate::itertools_mini::zip5;
use crate::traits::{self, Data, Set};
use crate::{Color, Default, Display, Figure, Label, LineType, LineWidth, Plot, Script};

Expand Down Expand Up @@ -140,7 +141,7 @@ where
} = candlesticks;

let data = Matrix::new(
itertools::izip!(x, box_min, whisker_min, whisker_high, box_high),
zip5(x, box_min, whisker_min, whisker_high, box_high),
(x_factor, y_factor, y_factor, y_factor, y_factor),
);
self.plots
Expand Down
2 changes: 1 addition & 1 deletion plot/src/curve.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,7 @@ where
let (x_factor, y_factor) =
crate::scale_factor(&self.axes, props.axes.unwrap_or(crate::Axes::BottomXLeftY));

let data = Matrix::new(itertools::izip!(x, y), (x_factor, y_factor));
let data = Matrix::new(x.into_iter().zip(y), (x_factor, y_factor));
self.plots.push(Plot::new(data, &props));
self
}
Expand Down
3 changes: 2 additions & 1 deletion plot/src/errorbar.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
use std::borrow::Cow;

use crate::data::Matrix;
use crate::itertools_mini::zip4;
use crate::traits::{self, Data, Set};
use crate::{
Color, Display, ErrorBarDefault, Figure, Label, LineType, LineWidth, Plot, PointSize,
Expand Down Expand Up @@ -259,7 +260,7 @@ where
} => (x, y, y_low, y_high, y_factor),
};
let data = Matrix::new(
itertools::izip!(x, y, length, height),
zip4(x, y, length, height),
(x_factor, y_factor, e_factor, e_factor),
);
self.plots.push(Plot::new(
Expand Down
3 changes: 2 additions & 1 deletion plot/src/filledcurve.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
use std::borrow::Cow;

use crate::data::Matrix;
use crate::itertools_mini::zip3;
use crate::traits::{self, Data, Set};
use crate::{Axes, Color, Default, Display, Figure, Label, Opacity, Plot, Script};

Expand Down Expand Up @@ -132,7 +133,7 @@ where
let (x_factor, y_factor) =
crate::scale_factor(&self.axes, props.axes.unwrap_or(crate::Axes::BottomXLeftY));

let data = Matrix::new(itertools::izip!(x, y1, y2), (x_factor, y_factor, y_factor));
let data = Matrix::new(zip3(x, y1, y2), (x_factor, y_factor, y_factor));
self.plots.push(Plot::new(data, &props));
self
}
Expand Down
35 changes: 35 additions & 0 deletions plot/src/itertools_mini.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
pub fn zip3<A: IntoIterator, B: IntoIterator, C: IntoIterator>(
a: A,
b: B,
c: C,
) -> impl Iterator<Item = (A::Item, B::Item, C::Item)> {
a.into_iter().zip(b).zip(c).map(|((a, b), c)| (a, b, c))
}

pub fn zip4<A: IntoIterator, B: IntoIterator, C: IntoIterator, D: IntoIterator>(
a: A,
b: B,
c: C,
d: D,
) -> impl Iterator<Item = (A::Item, B::Item, C::Item, D::Item)> {
a.into_iter()
.zip(b)
.zip(c)
.zip(d)
.map(|(((a, b), c), d)| (a, b, c, d))
}

pub fn zip5<A: IntoIterator, B: IntoIterator, C: IntoIterator, D: IntoIterator, E: IntoIterator>(
a: A,
b: B,
c: C,
d: D,
e: E,
) -> impl Iterator<Item = (A::Item, B::Item, C::Item, D::Item, E::Item)> {
a.into_iter()
.zip(b)
.zip(c)
.zip(d)
.zip(e)
.map(|((((a, b), c), d), e)| (a, b, c, d, e))
}
1 change: 1 addition & 0 deletions plot/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -391,6 +391,7 @@ pub mod curve;
pub mod errorbar;
pub mod filledcurve;
pub mod grid;
mod itertools_mini;
pub mod key;
pub mod prelude;
pub mod proxy;
Expand Down
14 changes: 14 additions & 0 deletions src/itertools_mini.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
pub fn chunk_by<'c, T, Key: 'c + Copy + Eq>(
c: &'c [T],
by: impl Copy + for<'a> Fn(&'a T) -> Key,
) -> impl Iterator<Item = (Key, &'c [T])> {
c.chunk_by(move |a, b| {
let a_key = by(a);
let b_key = by(b);
a_key == b_key
})
.map(move |chunk| {
let key = by(&chunk[0]); // Chunks are never empty.
(key, chunk)
})
}
1 change: 1 addition & 0 deletions src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ mod estimate;
mod format;
mod fs;
mod html;
mod itertools_mini;
mod kde;
mod macros;
pub mod measurement;
Expand Down
5 changes: 3 additions & 2 deletions src/plot/gnuplot_backend/summary.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
use super::{debug_script, gnuplot_escape};
use super::{DARK_BLUE, DEFAULT_FONT, KDE_POINTS, LINEWIDTH, POINT_SIZE, SIZE};
use crate::itertools_mini::chunk_by;
use crate::kde;
use crate::measurement::ValueFormatter;
use crate::report::{BenchmarkId, ValueType};
use crate::stats::univariate::Sample;
use crate::AxisScale;
use criterion_plot::prelude::*;
use itertools::Itertools;
use std::cmp::Ordering;
use std::path::{Path, PathBuf};
use std::process::Child;
Expand Down Expand Up @@ -84,8 +84,9 @@ pub fn line_comparison(
// This assumes the curves are sorted. It also assumes that the benchmark IDs all have numeric
// values or throughputs and that value is sensible (ie. not a mix of bytes and elements
// or whatnot)
for (key, group) in &all_curves.iter().chunk_by(|&&&(id, _)| &id.function_id) {
for (key, group) in chunk_by(all_curves, |&&(id, _)| &id.function_id) {
let mut tuples: Vec<_> = group
.iter()
.map(|&&(id, ref sample)| {
// Unwrap is fine here because it will only fail if the assumptions above are not true
// ie. programmer error.
Expand Down
5 changes: 3 additions & 2 deletions src/plot/plotters_backend/summary.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use super::*;
use crate::itertools_mini::chunk_by;
use crate::AxisScale;
use itertools::Itertools;
use plotters::coord::{
ranged1d::{AsRangedCoord, ValueFormatter as PlottersValueFormatter},
Shift,
Expand Down Expand Up @@ -132,8 +132,9 @@ fn line_comparison_series_data<'a>(
// This assumes the curves are sorted. It also assumes that the benchmark IDs all have numeric
// values or throughputs and that value is sensible (ie. not a mix of bytes and elements
// or whatnot)
for (key, group) in &all_curves.iter().chunk_by(|&&&(id, _)| &id.function_id) {
for (key, group) in chunk_by(&all_curves, |&&(id, _)| &id.function_id) {
let mut tuples: Vec<_> = group
.iter()
.map(|&&(id, ref sample)| {
// Unwrap is fine here because it will only fail if the assumptions above are not true
// ie. programmer error.
Expand Down