From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 18 Jul 2021 22:55:06 +0000 (+0100)
Subject: jst-lower: Prep for other ZUS
X-Git-Tag: otter-0.7.2~40
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=6eb4389cdb029d8d5c9b13f2dacd1536daea618d;p=otter.git

jst-lower: Prep for other ZUS

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/jstest/jst-lower.rs b/jstest/jst-lower.rs
index bc7fd365..78909a79 100644
--- a/jstest/jst-lower.rs
+++ b/jstest/jst-lower.rs
@@ -353,7 +353,9 @@ impl TestsAccumulator {
     ).collect_vec();
 
     let pieces_configs = ids.iter().cloned().map(|id| {
-      [false,true].iter().cloned().map( move |bottom| {
+      iproduct!(
+        [false,true].iter().cloned()
+      ).map( move |bottom| {
         StartPieceSpec {
           id,
           pinned: bottom,
diff --git a/src/prelude.rs b/src/prelude.rs
index 1425ebc8..62ef2587 100644
--- a/src/prelude.rs
+++ b/src/prelude.rs
@@ -68,7 +68,7 @@ pub use flexi_logger::LogSpecification;
 pub use fs2::FileExt;
 pub use if_chain::if_chain;
 pub use index_vec::{define_index_type, index_vec, IndexSlice, IndexVec};
-pub use itertools::{izip, zip_eq, EitherOrBoth, Itertools};
+pub use itertools::{iproduct, izip, zip_eq, EitherOrBoth, Itertools};
 pub use lazy_static::lazy_static;
 pub use log::{debug, error, info, trace, warn};
 pub use log::{log, log_enabled};