Merge pull request #169 from alexcrichton/merge-

Merge with upstream

Author: alexcrichton

.github/actions/install-rust/action.yml

@@ -9,7 +9,7 @@ inputs:
   msrv_range:
     description: 'Versions later-than-latest-Rust the MSRV supports'
     required: false
-    default: '1'
+    default: '2'
 
 runs:
   using: composite
@@ -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-2025-04-03" >> "$GITHUB_OUTPUT"
+          echo "version=nightly-2025-05-16" >> "$GITHUB_OUTPUT"
         else
           echo "version=${{ inputs.toolchain }}" >> "$GITHUB_OUTPUT"
         fi

.github/workflows/main.yml

@@ -812,8 +812,15 @@ jobs:
       if: matrix.filter == 'linux-x64' && contains(matrix.bucket, 'wasmtime-cli')
       uses: abrown/install-vtune-action@v1
 
-    # Build and test all features
-    - run: ./ci/run-tests.sh --locked ${{ matrix.bucket }}
+    # Build and test all features.
+    #
+    # Note that this uses a different shell, notably not `bash` on Windows. In
+    # the past `bash` would add more items to `PATH` on Windows which would
+    # interfere and cause the `gcc.exe` executable to fail and exit with 1 and
+    # no output. It's believed that `bash` adds things like `/usr/bin` to PATH
+    # which is the wrong DLL or something like that.
+    - run: python3 ./ci/run-tests.py --locked ${{ matrix.bucket }}
+      shell: pwsh
 
     # common logic to cancel the entire run if this job fails
     - uses: ./.github/actions/cancel-on-failure

Cargo.lock

@@ -173,7 +173,7 @@ exclude = [
 [workspace.package]
 version = "34.0.0"
 authors = ["The Wasmtime Project Developers"]
-edition = "2021"
+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.85.0"
@@ -187,19 +187,6 @@ unused_import_braces = 'warn'
 unused-lifetimes = 'warn'
 unused-macro-rules = 'warn'
 
-# Lints that are part of the `rust-2024-compatibility` group. This group is a
-# bit too noisy to enable wholesale but some selective items are ones we want to
-# opt-in to.
-keyword_idents_2024 = 'warn'
-unsafe-attr-outside-unsafe = 'warn'
-deprecated-safe-2024 = 'warn'
-rust-2024-guarded-string-incompatible-syntax = 'warn'
-rust-2024-prelude-collisions = 'warn'
-rust-2024-incompatible-pat = 'warn'
-missing-unsafe-on-extern = 'warn'
-impl-trait-overcaptures = 'warn'
-unsafe-op-in-unsafe-fn = 'warn'
-
 # Don't warn about unknown cfgs for pulley
 [workspace.lints.rust.unexpected_cfgs]
 level = "warn"
@@ -292,7 +279,7 @@ byte-array-literals = { path = "crates/wasi-preview1-component-adapter/byte-arra
 
 # Bytecode Alliance maintained dependencies:
 # ---------------------------
-regalloc2 = "0.12.1"
+regalloc2 = "0.12.2"
 
 # cap-std family:
 target-lexicon = "0.13.0"
@@ -309,8 +296,8 @@ io-extras = "0.18.1"
 rustix = "1.0.3"
 # wit-bindgen:
 wit-bindgen = { version = "0.42.1", default-features = false }
-wit-bindgen-rust-macro = { version = "0.42.1", default-features = false }
 wit-bindgen-rt = { version = "0.42.1", default-features = false }
+wit-bindgen-rust-macro = { version = "0.42.1", default-features = false }
 
 # wasm-tools family:
 wasmparser = { version = "0.230.0", default-features = false, features = ['simd'] }

Cargo.toml

@@ -1,5 +1,5 @@
 use criterion::measurement::WallTime;
-use criterion::{criterion_group, criterion_main, BenchmarkGroup, Criterion};
+use criterion::{BenchmarkGroup, Criterion, criterion_group, criterion_main};
 use std::fmt::Debug;
 use std::future::Future;
 use std::pin::Pin;

benches/call.rs

@@ -1,12 +1,12 @@
 use anyhow::Result;
-use criterion::{criterion_group, criterion_main, BenchmarkId, Criterion};
+use criterion::{BenchmarkId, Criterion, criterion_group, criterion_main};
 use std::cell::LazyCell;
 use std::path::Path;
 use std::process::Command;
-use std::sync::atomic::{AtomicBool, AtomicUsize, Ordering::SeqCst};
 use std::sync::Arc;
+use std::sync::atomic::{AtomicBool, AtomicUsize, Ordering::SeqCst};
 use std::thread;
-use wasi_common::{sync::WasiCtxBuilder, WasiCtx};
+use wasi_common::{WasiCtx, sync::WasiCtxBuilder};
 use wasmtime::*;
 
 fn store(engine: &Engine) -> Store<WasiCtx> {

benches/instantiation.rs

@@ -1,4 +1,4 @@
-use criterion::{criterion_group, criterion_main, Criterion};
+use criterion::{Criterion, criterion_group, criterion_main};
 use std::thread;
 use std::time::{Duration, Instant};
 use wasmtime::*;

benches/thread_eager_init.rs

@@ -1,8 +1,8 @@
 //! Measure some common WASI call scenarios.
 
-use criterion::{criterion_group, criterion_main, Criterion};
+use criterion::{Criterion, criterion_group, criterion_main};
 use std::{fs::File, path::Path, time::Instant};
-use wasi_common::{sync::WasiCtxBuilder, WasiCtx};
+use wasi_common::{WasiCtx, sync::WasiCtxBuilder};
 use wasmtime::{Engine, Linker, Module, Store, TypedFunc};
 
 criterion_group!(benches, bench_wasi);

benches/wasi.rs

@@ -95,14 +95,12 @@ const FULL_MATRIX = [
     "name": "Test Windows MSVC x86_64",
     "filter": "windows-x64",
   },
-  // FIXME: As of this writing, some of the GitHub images have a broken MinGW,
-  // leading CI to fail nondeterministically.
-  // {
-  //   "os": windows,
-  //   "target": "x86_64-pc-windows-gnu",
-  //   "name": "Test Windows MinGW x86_64",
-  //   "filter": "mingw-x64"
-  // },
+  {
+    "os": windows,
+    "target": "x86_64-pc-windows-gnu",
+    "name": "Test Windows MinGW x86_64",
+    "filter": "mingw-x64"
+  },
   {
     "os": ubuntu + '-arm',
     "target": "aarch64-unknown-linux-gnu",

ci/build-test-matrix.js

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/usr/bin/env python3
 
 # Excludes:
 #
@@ -15,12 +15,16 @@
 #
 # - veri_engine: requires an SMT solver (z3)
 
-cargo test \
-      --workspace \
-      --all-features \
-      --exclude test-programs \
-      --exclude wasmtime-wasi-nn \
-      --exclude wasmtime-fuzzing \
-      --exclude wasm-spec-interpreter \
-      --exclude veri_engine \
-      $@
+import subprocess
+import sys
+
+args = ['cargo', 'test', '--workspace', '--all-features']
+args.append('--exclude=test-programs')
+args.append('--exclude=wasmtime-wasi-nn')
+args.append('--exclude=wasmtime-fuzzing')
+args.append('--exclude=wasm-spec-interpreter')
+args.append('--exclude=veri_engine')
+args.extend(sys.argv[1:])
+
+result = subprocess.run(args)
+sys.exit(result.returncode)