Merge pull request #41 from Centril/fix-flatten-regression

Fix Itertools::flatten regression soon in nightly.
ubnt-intrepid · Jun 14, 2018 · a8bbd88 · a8bbd88
2 parents 77aac2b + 28946cf
commit a8bbd88
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/examples/facility.rs b/examples/facility.rs
@@ -43,8 +43,8 @@ fn main() {
     })
     .collect();
 
-  let expr = Zip::new((open.iter().chain(transport.iter().flatten()),
-                       fixed_costs.iter().chain(trans_costs.iter().flatten())))
+  let expr = Zip::new((open.iter().chain(Itertools::flatten(transport.iter())),
+                       fixed_costs.iter().chain(Itertools::flatten(trans_costs.iter()))))
     .fold(LinExpr::new(), |expr, (x, &c)| expr + c * x);
   model.set_objective(expr, Minimize).unwrap();
   model.update().unwrap();

diff --git a/examples/workforce/mod.rs b/examples/workforce/mod.rs
@@ -50,7 +50,8 @@ pub fn make_model(env: &Env) -> Result<Model> {
   try!(model.update());
 
   let objterm = pays.iter().map(|pay| repeat(pay).take(shifts.len()));
-  let objexpr = Zip::new((x.iter().flatten(), objterm.flatten())).fold(LinExpr::new(), |expr, (x, &c)| expr + c * x);
+  let objexpr = Zip::new((Itertools::flatten(x.iter()), Itertools::flatten(objterm)))
+                  .fold(LinExpr::new(), |expr, (x, &c)| expr + c * x);
   try!(model.set_objective(objexpr, Minimize));
 
   for (s, (shift, &requirement)) in shifts.iter().zip(shift_requirements.iter()).enumerate() {