diff --git a/.github/workflows/static.yml b/.github/workflows/static.yml index e45fbe4..53d0ac0 100644 --- a/.github/workflows/static.yml +++ b/.github/workflows/static.yml @@ -10,7 +10,7 @@ on: env: CARGO_TERM_COLOR: always - RUST_VERSION: "1.94.0" + RUST_VERSION: "1.95.0" # Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages permissions: diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 42db2db..92c5d1d 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -7,7 +7,7 @@ on: env: CARGO_TERM_COLOR: always - RUST_VERSION: "1.94.0" + RUST_VERSION: "1.95.0" jobs: # Check formatting & basic code validity diff --git a/CHANGELOG.md b/CHANGELOG.md index 2c23669..d699d95 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,11 +14,12 @@ - doc images as `.webp` and naming of TACO (toolsuite / model checker) consistent (#3) - replaced `localhost` reference in `sitemap.xml` and `robots.txt` (#2) +- fix clippy issues with 1.95 (#8) ### Added - Elaborate on the function of the different preprocessors (#6) -- upgrade CI pipeline & Dockerfile to Rust 1.94 +- upgrade CI pipeline & Dockerfile to Rust 1.95 (#8) ## [v0.1.0] diff --git a/crates/taco-interval-ta/src/builder/static_interval_order.rs b/crates/taco-interval-ta/src/builder/static_interval_order.rs index b04a9b8..23ba2d7 100644 --- a/crates/taco-interval-ta/src/builder/static_interval_order.rs +++ b/crates/taco-interval-ta/src/builder/static_interval_order.rs @@ -295,7 +295,7 @@ impl IntervalOrder for StaticIntervalOrder { ib_1.encode_comparison_to_boolean_expression(ComparisonOp::Eq, ib_2) }); - let single_var_constr = self.single_var_order.iter().flat_map(|(_, intervals)| { + let single_var_constr = self.single_var_order.values().flat_map(|intervals| { intervals .iter() .filter(|i| i.ub() != &IntervalBoundary::Infty) @@ -318,7 +318,7 @@ impl IntervalOrder for StaticIntervalOrder { }) }); - let multi_var_constr = self.multi_var_order.iter().flat_map(|(_, intervals)| { + let multi_var_constr = self.multi_var_order.values().flat_map(|intervals| { intervals .iter() .filter(|i| i.ub() != &IntervalBoundary::Infty) diff --git a/crates/taco-interval-ta/src/builder/static_interval_order/simple_order_generator.rs b/crates/taco-interval-ta/src/builder/static_interval_order/simple_order_generator.rs index 72ced5a..6d56b34 100644 --- a/crates/taco-interval-ta/src/builder/static_interval_order/simple_order_generator.rs +++ b/crates/taco-interval-ta/src/builder/static_interval_order/simple_order_generator.rs @@ -336,7 +336,7 @@ impl IncompleteOrder { }) .collect::, _>>()?; - Ok(ctx.get_smt_solver().and_many(smt_borders.into_iter())) + Ok(ctx.get_smt_solver().and_many(smt_borders)) }) .collect::, _>>()?; @@ -376,7 +376,7 @@ impl IncompleteOrder { }) .collect::, _>>()?; - Ok::<_, SMTSolverError>(ctx.get_smt_solver().and_many(eq_exprs.into_iter())) + Ok::<_, SMTSolverError>(ctx.get_smt_solver().and_many(eq_exprs)) }) .collect::, _>>()?;