From 2891f3646641efe76aba18b5438743b45e0cf2bc Mon Sep 17 00:00:00 2001
From: Alex Crichton <alex@alexcrichton.com>
Date: Tue, 22 Oct 2024 11:03:31 -0700
Subject: [PATCH 1/3] Bump MSRV to 1.80

This commit updates the minimum Rust version required to compile
Wasmtime to 1.80.0 from the previous 1.78.0.
---
 Cargo.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Cargo.toml b/Cargo.toml
index f1122821b28d..7e93ab1296d8 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -165,7 +165,7 @@ authors = ["The Wasmtime Project Developers"]
 edition = "2021"
 # Wasmtime's current policy is that this number can be no larger than the
 # current stable release of Rust minus 2.
-rust-version = "1.78.0"
+rust-version = "1.80.0"
 
 [workspace.lints.rust]
 # Turn on some lints which are otherwise allow-by-default in rustc.

From 989f7f7572c5bde27853856ca9eacd3dedd59713 Mon Sep 17 00:00:00 2001
From: Alex Crichton <alex@alexcrichton.com>
Date: Tue, 22 Oct 2024 11:05:15 -0700
Subject: [PATCH 2/3] Update rust installation in CI

* Change MSRV window back to 2 now that oss-fuzz is resolved
* Update the nightly to the latest nightly
---
 .github/actions/install-rust/action.yml | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/.github/actions/install-rust/action.yml b/.github/actions/install-rust/action.yml
index 5f6a287d30c3..87a05edb8fbd 100644
--- a/.github/actions/install-rust/action.yml
+++ b/.github/actions/install-rust/action.yml
@@ -9,15 +9,7 @@ inputs:
   msrv_range:
     description: 'Versions later-than-latest-Rust the MSRV supports'
     required: false
-    # Note that this is currently set to 3 as the MSRV is 1.78 and current
-    # stable is 1.81. Currently MSRV cannot be updated as it would break the
-    # build on OSS-Fuzz which hasn't updated its Rust compiler in quite some time.
-    #
-    # Updating OSS-Fuzz is being done in
-    # https://github.com/google/oss-fuzz/pull/12365 but it's taking some time,
-    # so for now this'll get bumped instead of MSRV while we wait for the update
-    # to happen.
-    default: '3'
+    default: '2'
 
 runs:
   using: composite
@@ -36,7 +28,7 @@ runs:
         elif [ "${{ inputs.toolchain }}" = "msrv" ]; then
           echo "version=1.$msrv.0" >> "$GITHUB_OUTPUT"
         elif [ "${{ inputs.toolchain }}" = "wasmtime-ci-pinned-nightly" ]; then
-          echo "version=nightly-2024-10-01" >> "$GITHUB_OUTPUT"
+          echo "version=nightly-2024-10-22" >> "$GITHUB_OUTPUT"
         else
           echo "version=${{ inputs.toolchain }}" >> "$GITHUB_OUTPUT"
         fi

From 8373b3f29e06ec3fbae605d5fa22d8b9feb4b6d5 Mon Sep 17 00:00:00 2001
From: Alex Crichton <alex@alexcrichton.com>
Date: Tue, 22 Oct 2024 13:58:09 -0700
Subject: [PATCH 3/3] Undo most of the nightly update

---
 .github/actions/install-rust/action.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/actions/install-rust/action.yml b/.github/actions/install-rust/action.yml
index 87a05edb8fbd..a0859dda1206 100644
--- a/.github/actions/install-rust/action.yml
+++ b/.github/actions/install-rust/action.yml
@@ -28,7 +28,7 @@ runs:
         elif [ "${{ inputs.toolchain }}" = "msrv" ]; then
           echo "version=1.$msrv.0" >> "$GITHUB_OUTPUT"
         elif [ "${{ inputs.toolchain }}" = "wasmtime-ci-pinned-nightly" ]; then
-          echo "version=nightly-2024-10-22" >> "$GITHUB_OUTPUT"
+          echo "version=nightly-2024-10-02" >> "$GITHUB_OUTPUT"
         else
           echo "version=${{ inputs.toolchain }}" >> "$GITHUB_OUTPUT"
         fi