From 92f415ea3f27c6e2a4ae7e5365bb69ef8ea6c1b0 Mon Sep 17 00:00:00 2001
From: Philipp Schuster <philipp.schuster@cyberus-technology.de>
Date: Fri, 15 Aug 2025 09:42:27 +0200
Subject: [PATCH] build: Bump MSRV to 1.88

This is necessary to use the let-chains feature in a
follow-up. After upgrading to Rust edition 2024, clippy
wants to collapse various if's with let-chains.

Update image to 20250815-0 since MSRV in Dockerfile is updated.

Signed-off-by: Philipp Schuster <philipp.schuster@cyberus-technology.de>
On-behalf-of: SAP philipp.schuster@sap.com
---
 .github/workflows/build.yaml           | 2 +-
 .github/workflows/docker-image.yaml    | 2 +-
 .github/workflows/preview-riscv64.yaml | 2 +-
 .github/workflows/release.yaml         | 2 +-
 Cargo.toml                             | 2 +-
 resources/Dockerfile                   | 4 ++--
 scripts/dev_cli.sh                     | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 428740dcd..286c2af54 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -15,7 +15,7 @@ jobs:
           - stable
           - beta
           - nightly
-          - "1.87.0"
+          - "1.88.0"
         target:
           - x86_64-unknown-linux-gnu
           - x86_64-unknown-linux-musl
diff --git a/.github/workflows/docker-image.yaml b/.github/workflows/docker-image.yaml
index 3e5f56458..a026eac2c 100644
--- a/.github/workflows/docker-image.yaml
+++ b/.github/workflows/docker-image.yaml
@@ -41,7 +41,7 @@ jobs:
           images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
           # generate Docker tags based on the following events/attributes
           tags: |
-            type=raw,value=20250807-0
+            type=raw,value=20250815-0
             type=sha
 
       - name: Build and push
diff --git a/.github/workflows/preview-riscv64.yaml b/.github/workflows/preview-riscv64.yaml
index 02f796b59..767d9779a 100644
--- a/.github/workflows/preview-riscv64.yaml
+++ b/.github/workflows/preview-riscv64.yaml
@@ -24,7 +24,7 @@ jobs:
           fetch-depth: 0
 
       - name: Install Rust toolchain
-        run: /opt/scripts/exec-in-qemu.sh rustup default 1.87.0
+        run: /opt/scripts/exec-in-qemu.sh rustup default 1.88.0
 
       - name: Build ${{ matrix.module }} Module (kvm)
         run: /opt/scripts/exec-in-qemu.sh cargo rustc --locked -p ${{ matrix.module }} --no-default-features --features "kvm" -- -D warnings -D clippy::undocumented_unsafe_blocks -W clippy::assertions_on_result_states
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 44842475d..4876fd5d9 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -45,7 +45,7 @@ jobs:
           target: ${{ matrix.platform.target }}
           args: ${{ matrix.platform.args  }}
           strip: true
-          toolchain: "1.87.0"
+          toolchain: "1.88.0"
       - name: Copy Release Binaries
         if: github.event_name == 'create' && github.event.ref_type == 'tag'
         shell: bash
diff --git a/Cargo.toml b/Cargo.toml
index c621c256d..9714ab4f8 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -15,7 +15,7 @@ version = "47.0.0"
 # a.) A dependency requires it,
 # b.) If we want to use a new feature and that MSRV is at least 6 months old,
 # c.) There is a security issue that is addressed by the toolchain update.
-rust-version = "1.87.0"
+rust-version = "1.88.0"
 
 [profile.release]
 codegen-units = 1
diff --git a/resources/Dockerfile b/resources/Dockerfile
index a650c4821..704e8602f 100644
--- a/resources/Dockerfile
+++ b/resources/Dockerfile
@@ -8,7 +8,7 @@
 FROM ubuntu:24.04 AS dev
 
 ARG TARGETARCH
-ARG RUST_TOOLCHAIN="1.87.0"
+ARG RUST_TOOLCHAIN="1.88.0"
 ARG CLH_SRC_DIR="/cloud-hypervisor"
 ARG CLH_BUILD_DIR="$CLH_SRC_DIR/build"
 ARG CARGO_REGISTRY_DIR="$CLH_BUILD_DIR/cargo_registry"
@@ -123,7 +123,7 @@ RUN echo 'source $CARGO_HOME/env' >> "$HOME"/.bashrc \
     && mkdir "$HOME"/.cargo \
     && ln -s $CARGO_HOME/env "$HOME"/.cargo/env
 
-# Allow pip to install packages system wide 
+# Allow pip to install packages system wide
 # hadolint ignore=DL3003,SC2046
 RUN rm /usr/lib/python3.12/EXTERNALLY-MANAGED \
         && git clone https://github.com/spdk/spdk \
diff --git a/scripts/dev_cli.sh b/scripts/dev_cli.sh
index 3349afa9d..257889ae5 100755
--- a/scripts/dev_cli.sh
+++ b/scripts/dev_cli.sh
@@ -9,7 +9,7 @@ CLI_NAME="Cloud Hypervisor"
 CTR_IMAGE_TAG="ghcr.io/cloud-hypervisor/cloud-hypervisor"
 
 # Needs to match explicit version in docker-image.yaml workflow
-CTR_IMAGE_VERSION="20250807-0"
+CTR_IMAGE_VERSION="20250815-0"
 : "${CTR_IMAGE:=${CTR_IMAGE_TAG}:${CTR_IMAGE_VERSION}}"
 
 DOCKER_RUNTIME="docker"