Commit 49c4b6f
authored
Upgrade toolchain to 2025-03-18 (#3959)
The main change to get the toolchain upgrade to 2025-03-18 to work is to
make this change in `kani-regression.sh`:
```diff
-RUSTFLAGS="-D warnings" cargo build --target-dir /tmp/kani_build_warnings
+RUSTFLAGS="-D warnings" cargo build --target-dir /tmp/kani_build_warnings --no-default-features --features cprover
```
Explanation:
1. `cargo build` suppresses warnings from dependencies unless they're
local dependencies (e.g. included with `path = ...`) (see
rust-lang/cargo#8546)
2. Since we integrate `charon` as a git submodule and add it as a
dependency using `path = ...`, its warnings are not suppressed
3. The toolchain upgrade includes adding a `#[must_use]` attribute on an
enum used in charon:
rust-lang/rust@2439623278. This results in a
warning that causes the `RUSTFLAGS="-D warnings" cargo build` to fail:
https://github.com/model-checking/kani/actions/runs/13914318184/job/38934470822#step:4:2983
The short-term solution in this PR is to exclude the Charon feature when
building with `-D warnings`.
The long-term solution is to fix the warning in upstream Charon (if it's
not already fixed), and update our Charon pin to point to a commit that
includes the fix. Updating the Charon pin requires us to upgrade our MIR
to ULLBC module though, which will require a non-trivial amount of work
since it's 2.5 months old.
Resolves #3944
By submitting this pull request, I confirm that my contribution is made
under the terms of the Apache 2.0 and MIT licenses.1 parent c0b3286 commit 49c4b6f
File tree
3 files changed
+9
-2
lines changed- kani-compiler/src
- scripts
3 files changed
+9
-2
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
41 | 41 | | |
42 | 42 | | |
43 | 43 | | |
| 44 | + | |
44 | 45 | | |
45 | 46 | | |
46 | 47 | | |
| |||
49 | 50 | | |
50 | 51 | | |
51 | 52 | | |
| 53 | + | |
52 | 54 | | |
53 | 55 | | |
54 | 56 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
2 | 2 | | |
3 | 3 | | |
4 | 4 | | |
5 | | - | |
| 5 | + | |
6 | 6 | | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
105 | 105 | | |
106 | 106 | | |
107 | 107 | | |
108 | | - | |
| 108 | + | |
| 109 | + | |
| 110 | + | |
| 111 | + | |
| 112 | + | |
| 113 | + | |
109 | 114 | | |
110 | 115 | | |
111 | 116 | | |
| |||
0 commit comments