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 bc7fd365f704b4103f43752445f71221cd0510df..78909a7906d5cf2831ba1332fb1890add2be03ff 100644 (file)
--- 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 1425ebc891cc706db556d344a306c0cf00c5f2d8..62ef25875dda01742a0c05a049d3abd43a131101 100644 (file)
--- 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};