Merge branch 'main' into update-toolchain-2025-02-26

Author: remi-delmas-3000

.github/workflows/bench.yml

@@ -15,7 +15,7 @@ on:
 
 jobs:
   perf-benchcomp:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     steps:
       - name: Save push event HEAD and HEAD~ to environment variables
         if: ${{ github.event_name == 'push' }}
@@ -46,13 +46,13 @@ jobs:
       - name: Set up Kani Dependencies (old variant)
         uses: ./old/.github/actions/setup
         with:
-          os: ubuntu-20.04
+          os: ubuntu-24.04
           kani_dir: old
 
       - name: Set up Kani Dependencies (new variant)
         uses: ./new/.github/actions/setup
         with:
-          os: ubuntu-20.04
+          os: ubuntu-24.04
           kani_dir: new
 
       - name: Copy benchmarks from new to old

.github/workflows/cbmc-latest.yml

@@ -19,7 +19,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [macos-13, ubuntu-20.04, ubuntu-22.04]
+        os: [macos-13, ubuntu-22.04, ubuntu-24.04]
     steps:
       - name: Checkout Kani under "kani"
         uses: actions/checkout@v4
@@ -61,7 +61,7 @@ jobs:
         run: ./scripts/kani-regression.sh
 
   perf:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     steps:
       - name: Checkout Kani under "kani"
         uses: actions/checkout@v4
@@ -71,7 +71,7 @@ jobs:
       - name: Setup Kani Dependencies
         uses: ./kani/.github/actions/setup
         with:
-          os: ubuntu-20.04
+          os: ubuntu-24.04
           kani_dir: 'kani'
 
       - name: Build Kani using release mode

.github/workflows/deny.yml

@@ -20,6 +20,8 @@ jobs:
       - uses: actions/checkout@v4
         with:
           submodules: recursive
+      - name: Install rustup
+        run: ./scripts/setup/install_rustup.sh
       - uses: EmbarkStudios/cargo-deny-action@v2
         with:
           arguments: --all-features --workspace

.github/workflows/format-check.yml

@@ -31,15 +31,15 @@ jobs:
           ./scripts/run-autopep8.sh
 
   clippy-check:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     steps:
       - name: Checkout Kani
         uses: actions/checkout@v4
 
       - name: Setup Kani Dependencies
         uses: ./.github/actions/setup
         with:
-          os: ubuntu-20.04
+          os: ubuntu-24.04
 
       - name: 'Install jq for parsing.'
         run: |

.github/workflows/kani.yml

@@ -18,7 +18,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [macos-13, ubuntu-20.04, ubuntu-22.04, ubuntu-24.04, macos-14]
+        os: [macos-13, ubuntu-22.04, ubuntu-24.04, macos-14]
     steps:
       - name: Checkout Kani
         uses: actions/checkout@v4
@@ -32,7 +32,7 @@ jobs:
         run: ./scripts/kani-regression.sh
 
   benchcomp-tests:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     steps:
       - name: Checkout Kani
         uses: actions/checkout@v4
@@ -46,7 +46,7 @@ jobs:
       - name: Setup Kani Dependencies
         uses: ./.github/actions/setup
         with:
-          os: ubuntu-20.04
+          os: ubuntu-24.04
 
       - name: Build Kani using release mode
         run: cargo build-dev -- --release
@@ -55,23 +55,23 @@ jobs:
         run: pushd tools/benchcomp && PATH=$(realpath ../../scripts):$PATH test/run
 
   perf:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     steps:
       - name: Checkout Kani
         uses: actions/checkout@v4
 
       - name: Setup Kani Dependencies
         uses: ./.github/actions/setup
         with:
-          os: ubuntu-20.04
+          os: ubuntu-24.04
 
       - name: Execute Kani performance tests
         run: ./scripts/kani-perf.sh
         env:
           RUST_TEST_THREADS: 1
 
   documentation:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     permissions:
       contents: write
     steps:

.github/workflows/release.yml

@@ -70,7 +70,7 @@ jobs:
 
   build_bundle_linux:
     name: BuildBundle-Linux
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     outputs:
       version: ${{ steps.bundle.outputs.version }}
       bundle: ${{ steps.bundle.outputs.bundle }}
@@ -83,7 +83,7 @@ jobs:
       - name: Setup Kani Dependencies
         uses: ./.github/actions/setup
         with:
-          os: ubuntu-20.04
+          os: ubuntu-22.04
 
       - name: Build bundle
         id: bundle
@@ -97,14 +97,11 @@ jobs:
     needs: [build_bundle_macos, build_bundle_linux]
     strategy:
       matrix:
-        os: [macos-13, ubuntu-20.04, ubuntu-22.04, ubuntu-24.04]
+        os: [macos-13, ubuntu-22.04, ubuntu-24.04]
         include:
         - os: macos-13
           rust_target: x86_64-apple-darwin
           prev_job: ${{ needs.build_bundle_macos.outputs }}
-        - os: ubuntu-20.04
-          rust_target: x86_64-unknown-linux-gnu
-          prev_job: ${{ needs.build_bundle_linux.outputs }}
         - os: ubuntu-22.04
           rust_target: x86_64-unknown-linux-gnu
           prev_job: ${{ needs.build_bundle_linux.outputs }}
@@ -200,7 +197,7 @@ jobs:
     needs: [build_bundle_macos, build_bundle_linux]
     strategy:
       matrix:
-        os: [macos-13, ubuntu-20.04, ubuntu-22.04, ubuntu-24.04]
+        os: [macos-13, ubuntu-22.04, ubuntu-24.04]
         include:
           # Stores the output of the previous job conditional to the OS
           - prev_job: ${{ needs.build_bundle_linux.outputs }}
@@ -244,7 +241,7 @@ jobs:
   kani_release:
     if: ${{ github.event_name == 'push' && startsWith(github.ref, 'refs/tags/kani-') }}
     name: Release
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     needs: [build_bundle_macos, build_bundle_macos_aarch64, build_bundle_linux, test_bundle]
     outputs:
       version: ${{ steps.versioning.outputs.version }}
@@ -301,12 +298,12 @@ jobs:
   package_docker:
     name: Package Docker
     needs: kani_release
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     permissions:
       contents: write
       packages: write
     env:
-      os: ubuntu-20.04
+      os: ubuntu-24.04
       target: x86_64-unknown-linux-gnu
     steps:
       - name: Checkout code
@@ -315,7 +312,7 @@ jobs:
       - name: Setup Kani Dependencies
         uses: ./.github/actions/setup
         with:
-          os: ubuntu-20.04
+          os: ubuntu-24.04
 
       - name: 'Build release bundle'
         run: |
@@ -339,7 +336,7 @@ jobs:
         uses: docker/build-push-action@v6
         with:
           context: .
-          file: scripts/ci/Dockerfile.bundle-release-20-04
+          file: scripts/ci/Dockerfile.bundle-release-24-04
           push: true
           github-token: ${{ secrets.GITHUB_TOKEN }}
           tags: |

.github/workflows/slow-tests.yml

@@ -18,7 +18,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [macos-13, ubuntu-20.04, ubuntu-22.04]
+        os: [macos-13, ubuntu-22.04, ubuntu-24.04]
     steps:
       - name: Checkout Kani
         uses: actions/checkout@v4

Cargo.lock

@@ -150,9 +150,9 @@ dependencies = [
 
 [[package]]
 name = "bitflags"
-version = "2.8.0"
+version = "2.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f68f53c83ab957f72c32642f3868eec03eb974d1fb82e453128456482613d36"
+checksum = "5c8214115b7bf84099f1309324e63141d4c5d7cc26862f97a0a857dbefe165bd"
 
 [[package]]
 name = "brownstone"
@@ -216,9 +216,9 @@ dependencies = [
 
 [[package]]
 name = "cargo_metadata"
-version = "0.19.1"
+version = "0.19.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8769706aad5d996120af43197bf46ef6ad0fda35216b4505f926a365a232d924"
+checksum = "dd5eb614ed4c27c5d706420e4320fbe3216ab31fa1c33cd8246ac36dae4479ba"
 dependencies = [
  "camino",
  "cargo-platform",
@@ -230,9 +230,9 @@ dependencies = [
 
 [[package]]
 name = "cc"
-version = "1.2.15"
+version = "1.2.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c736e259eea577f443d5c86c304f9f4ae0295c43f3ba05c21f1d66b5f06001af"
+checksum = "be714c154be609ec7f5dad223a33bf1482fff90472de28f7362806e6d4832b8c"
 dependencies = [
  "shlex",
 ]
@@ -282,19 +282,19 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "4.5.30"
+version = "4.5.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "92b7b18d71fad5313a1e320fa9897994228ce274b60faa4d694fe0ea89cd9e6d"
+checksum = "027bb0d98429ae334a8698531da7077bdf906419543a35a55c2cb1b66437d767"
 dependencies = [
  "clap_builder",
  "clap_derive",
 ]
 
 [[package]]
 name = "clap_builder"
-version = "4.5.30"
+version = "4.5.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a35db2071778a7344791a4fb4f95308b5673d219dee3ae348b86642574ecc90c"
+checksum = "5589e0cba072e0f3d23791efac0fd8627b49c829c196a492e88168e6a669d863"
 dependencies = [
  "anstream",
  "anstyle",
@@ -375,9 +375,9 @@ dependencies = [
 
 [[package]]
 name = "console"
-version = "0.15.10"
+version = "0.15.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea3c6ecd8059b57859df5c69830340ed3c41d30e3da0c1cbed90a96ac853041b"
+checksum = "054ccb5b10f9f2cbf51eb355ca1d05c2d279ce1804688d0db74b4733a5aeafd8"
 dependencies = [
  "encode_unicode",
  "libc",

scripts/setup/install_rustup.sh

@@ -5,5 +5,11 @@
 set -eux
 
 # Install Rust toolchain
-curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y \
-  && source  ~/.cargo/env
+curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
+# Don't use .cargo/env as that won't prepend .cargo/bin to the PATH when it's
+# already somewhere in there
+export PATH="$HOME/.cargo/bin:$PATH"
+SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
+pushd ${SCRIPT_DIR}/../../
+rustup toolchain install
+popd