Skip to content

maintenance: upgrade to Rust 1.95 #8

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

Merged
pleich merged 1 commit into from
Apr 20, 2026
Merged

maintenance: upgrade to Rust 1.95 #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion .github/workflows/static.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ on:

env:
CARGO_TERM_COLOR: always
RUST_VERSION: "1.94.0"
RUST_VERSION: "1.95.0"
Comment on lines 11 to +13
Copy link

Copilot AI Apr 17, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This workflow pins RUST_VERSION, but later steps (e.g., cargo doc in “Generate Docs”) run without +${RUST_VERSION} and will use the runner's default toolchain unless you set it explicitly. To make the Rust 1.95 upgrade effective/reproducible, either run cargo +${RUST_VERSION} ... for these commands or set rustup default ${RUST_VERSION} after installation.

Copilot uses AI. Check for mistakes.

# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
permissions:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:

env:
CARGO_TERM_COLOR: always
RUST_VERSION: "1.94.0"
RUST_VERSION: "1.95.0"
Comment on lines 8 to +10
Copy link

Copilot AI Apr 17, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

RUST_VERSION is bumped, but the doc_check job still runs cargo test / cargo doc without selecting that toolchain, so those steps will execute on whatever the runner's default toolchain is (and may not be 1.95.0). Consider either prefixing these commands with +${RUST_VERSION} or setting rustup default ${RUST_VERSION} (or rustup override set) early in the job to ensure the pinned version is actually used.

Copilot uses AI. Check for mistakes.

jobs:
# Check formatting & basic code validity
Expand Down
3 changes: 2 additions & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]

Expand Down
4 changes: 2 additions & 2 deletions crates/taco-interval-ta/src/builder/static_interval_order.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions crates/taco-interval-ta/src/builder/static_interval_order/simple_order_generator.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -336,7 +336,7 @@ impl IncompleteOrder {
})
.collect::<Result<Vec<_>, _>>()?;

Ok(ctx.get_smt_solver().and_many(smt_borders.into_iter()))
Ok(ctx.get_smt_solver().and_many(smt_borders))
})
.collect::<Result<Vec<_>, _>>()?;

Expand Down Expand Up @@ -376,7 +376,7 @@ impl IncompleteOrder {
})
.collect::<Result<Vec<_>, _>>()?;

Ok::<_, SMTSolverError>(ctx.get_smt_solver().and_many(eq_exprs.into_iter()))
Ok::<_, SMTSolverError>(ctx.get_smt_solver().and_many(eq_exprs))
})
.collect::<Result<Vec<_>, _>>()?;

Expand Down
Loading