Skip to content

A lightweight WebAssembly runtime that is fast, secure, and standards-compliant

Bump MSRV to 1.96.0 (#14184)

Alex Crichton1eb4236d9e25
diff --git a/.github/actions/install-rust/action.yml b/.github/actions/install-rust/action.yml
index 70d430ea6c..ba79b3d8d4 100644
--- a/.github/actions/install-rust/action.yml
+++ b/.github/actions/install-rust/action.yml
@@ -32,7 +32,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-2026-08-12" >> "$GITHUB_OUTPUT"
+ echo "version=nightly-2026-08-20" >> "$GITHUB_OUTPUT"
elif [ "${{ inputs.toolchain }}" = "wasmtime-ci-oss-fuzz-pin" ]; then
# Do not change this number unless OSS-Fuzz has updated. If you update
# this version and do not update OSS-Fuzz then you will break our
diff --git a/Cargo.toml b/Cargo.toml
index af6699da03..d3c89c665d 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -225,7 +225,7 @@ authors = ["The Wasmtime Project Developers"]
edition = "2024"
# Wasmtime's current policy is that this number can be no larger than the
# current stable release of Rust minus 2.
-rust-version = "1.95.0"
+rust-version = "1.96.0"
[workspace.lints.rust]
# Turn on some lints which are otherwise allow-by-default in rustc.
diff --git a/crates/fiber/src/windows.rs b/crates/fiber/src/windows.rs
index d1a0d56540..f9bc319cc5 100644
--- a/crates/fiber/src/windows.rs
+++ b/crates/fiber/src/windows.rs
@@ -178,7 +178,19 @@ impl Fiber {
impl Drop for Fiber {
fn drop(&mut self) {
unsafe {
+ let is_fiber = IsThreadAFiber() != 0;
+ if !is_fiber {
+ // DeleteFiber runs FLS destructors. Make those destructors
+ // observe a fiber so Rust does not run thread-local cleanup
+ // for the live thread.
+ let fiber = ConvertThreadToFiber(ptr::null_mut());
+ assert!(!fiber.is_null(), "failed to make current thread a fiber");
+ }
DeleteFiber(self.fiber);
+ if !is_fiber {
+ let res = ConvertFiberToThread();
+ assert!(res != 0, "failed to convert main thread back");
+ }
}
}
}