Update WIT vendoring source and wit-bindgen (#137)

* Update WIT vendoring source and wit-bindgen

This commit updates how WITs are vendored here to use `wkg` the same way
that bytecodealliance/wasmtime#12327 does. This then updated to use the
latest `wit-bindgen` to be able to process the WITs which had a few
extra artifacts in them that made it necessary.

Generated bindings are changing here, but it's just things moving
around.

* Update wit-bindgen

* Update other CI tools

* Update MSRV to 1.87.0

* Update/pin more tools

Author: alexcrichton

.github/workflows/main.yml

@@ -23,11 +23,11 @@ jobs:
     - name: Install Wasmtime
       uses: bytecodealliance/actions/wasmtime/setup@v1
       with:
-        version: "v30.0.2"
+        version: "v40.0.2"
     - name: Install wasm-tools
       uses: bytecodealliance/actions/wasm-tools/setup@v1
       with:
-        version: "1.224.0"
+        version: "1.244.0"
 
     - run: cargo build -p wasip2 --examples --target wasm32-wasip2 --no-default-features
     - run: wasmtime run ./target/wasm32-wasip2/debug/examples/hello-world-no_std.wasm
@@ -83,14 +83,18 @@ jobs:
     steps:
     - uses: actions/checkout@v5
     - uses: ./.github/actions/install-rust
+    - name: Install wkg
+      run: |
+        curl -L --proto '=https' --tlsv1.2 -sSf https://raw.githubusercontent.com/cargo-bins/cargo-binstall/main/install-from-binstall-release.sh | bash
+        cargo binstall --no-confirm wkg
     # Re-vendor all WIT files and ensure that they're all up-to-date by ensuring
     # that there's no git changes.
     - name: Re-vendor WIT
       run: |
         ./ci/vendor-wit.sh
         git diff --exit-code
     - run: |
-        version=0.48.0
+        version=0.51.0
 
         mkdir wit-bindgen
         cd wit-bindgen
@@ -119,7 +123,7 @@ jobs:
         toolchain: ${{ matrix.rust }}
     - run: rustup target add wasm32-wasip2 wasm32-unknown-unknown
     - run: |
-        version=v0.5.19
+        version=v0.5.20
 
         mkdir ld
         cd ld
@@ -130,11 +134,11 @@ jobs:
     - name: Install wasmtime
       uses: bytecodealliance/actions/wasmtime/setup@v1
       with:
-        version: "dev"
+        version: "40.0.2"
     - name: Install wasm-tools
       uses: bytecodealliance/actions/wasm-tools/setup@v1
       with:
-        version: "1.241.2"
+        version: "1.244.0"
 
     - run: cargo build -p wasip3 --examples --target wasm32-wasip2
     - run: wasmtime run -Sp3 -Wcomponent-model-async ./target/wasm32-wasip2/debug/examples/cli_command.wasm

Cargo.toml

@@ -16,12 +16,12 @@ exclude = ["/.github", "/ci/", "/examples/"]
 edition = "2021"
 license = "Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT"
 repository = "https://github.com/bytecodealliance/wasi-rs"
-rust-version = "1.82.0"
+rust-version = "1.87.0"
 
 [workspace.dependencies]
 rand = { version = "0.8.5", default-features = false }
 wasi = { version = "0.14.6", path = ".", default-features = false }
-wit-bindgen = { version = "0.48.1", default-features = false }
+wit-bindgen = { version = "0.51.0", default-features = false }
 wasip1 = { version = "1.0.0", path = "crates/wasip1", default-features = false }
 wasip2 = { version = "1.0.1", path = "crates/wasip2", default-features = false }
 wasip3 = { version = "0.1.1", path = "crates/wasip3", default-features = false }

ci/vendor-wit.sh

@@ -6,35 +6,29 @@
 # This script is executed on CI to ensure that everything is up-to-date.
 set -ex
 
-# Space-separated list of wasi proposals that are vendored here along with the
-# tag that they're all vendored at.
-#
-# This assumes that the repositories all have the pattern:
-# https://github.com/WebAssembly/wasi-$repo
-# and every repository has a tag `v$tag` here. That is currently done as part
-# of the WASI release process.
-tag=0.2.4
-dst=wit/deps
 
-vendor() {
-  dst="$1"
-  tag="$2"
-  subdir="$3"
-  repos="$4"
+rm -rf crates/wasip2/wit/deps
+mkdir -p crates/wasip2/wit/deps
 
-  rm -rf $dst
-  mkdir -p $dst
+p2=0.2.4
+wkg get --overwrite --format wit "wasi:cli@${p2}" -o crates/wasip2/wit/deps/cli.wit
+wkg get --overwrite --format wit "wasi:clocks@${p2}" -o crates/wasip2/wit/deps/clocks.wit
+wkg get --overwrite --format wit "wasi:filesystem@${p2}" -o crates/wasip2/wit/deps/filesystem.wit
+wkg get --overwrite --format wit "wasi:http@${p2}" -o crates/wasip2/wit/deps/http.wit
+wkg get --overwrite --format wit "wasi:io@${p2}" -o crates/wasip2/wit/deps/io.wit
+wkg get --overwrite --format wit "wasi:random@${p2}" -o crates/wasip2/wit/deps/random.wit
+wkg get --overwrite --format wit "wasi:sockets@${p2}" -o crates/wasip2/wit/deps/sockets.wit
 
-  for repo in $repos; do
-    mkdir $dst/$repo
-    curl -L https://github.com/WebAssembly/wasi-$repo/archive/refs/tags/v$tag.tar.gz | \
-      tar xzf - --strip-components=2 -C $dst/$repo wasi-$repo-$tag/$subdir
-    rm -rf $dst/$repo/deps*
-  done
-}
+rm -rf crates/wasip3/wit/deps
+mkdir -p crates/wasip3/wit/deps
 
-vendor crates/wasip2/wit/deps 0.2.4 wit "cli clocks filesystem http io random sockets"
-vendor crates/wasip3/wit/deps 0.3.0-rc-2025-09-16 wit-0.3.0-draft "cli clocks filesystem http random sockets"
+p3=0.3.0-rc-2025-09-16
+wkg get --overwrite --format wit "wasi:cli@${p3}" -o crates/wasip3/wit/deps/cli.wit
+wkg get --overwrite --format wit "wasi:clocks@${p3}" -o crates/wasip3/wit/deps/clocks.wit
+wkg get --overwrite --format wit "wasi:filesystem@${p3}" -o crates/wasip3/wit/deps/filesystem.wit
+wkg get --overwrite --format wit "wasi:http@${p3}" -o crates/wasip3/wit/deps/http.wit
+wkg get --overwrite --format wit "wasi:random@${p3}" -o crates/wasip3/wit/deps/random.wit
+wkg get --overwrite --format wit "wasi:sockets@${p3}" -o crates/wasip3/wit/deps/sockets.wit
 
 # WASIp1 vendoring logic
 wasip1_rev="0ba0c5e2"

crates/wasip2/src/command.rs

@@ -1,4 +1,4 @@
-// Generated by `wit-bindgen` 0.48.0. DO NOT EDIT!
+// Generated by `wit-bindgen` 0.51.0. DO NOT EDIT!
 // Options used:
 //   * std_feature
 //   * with "wasi:cli/environment@0.2.4" = "crate::cli::environment"
@@ -133,7 +133,7 @@ pub mod exports {
 }
 #[rustfmt::skip]
 mod _rt {
-    #![allow(dead_code, clippy::all)]
+    #![allow(dead_code, unused_imports, clippy::all)]
     #[cfg(target_arch = "wasm32")]
     pub fn run_ctors_once() {
         wit_bindgen::rt::run_ctors_once();
@@ -167,7 +167,7 @@ macro_rules! __export_command_impl {
         exports::wasi::cli::run::__export_wasi_cli_run_0_2_4_cabi!($ty with_types_in
         $($path_to_types_root)*:: exports::wasi::cli::run); const _ : () = {
         #[rustfmt::skip] #[cfg(target_arch = "wasm32")] #[unsafe (link_section =
-        "component-type:wit-bindgen:0.48.0:wasi:cli@0.2.4:command:imports and exportsrust-wasip2-1.0.1+wasi-0.2.4-from-crates-io-command-world")]
+        "component-type:wit-bindgen:0.51.0:wasi:cli@0.2.4:command:imports and exportsrust-wasip2-1.0.1+wasi-0.2.4-from-crates-io-command-world")]
         #[doc(hidden)] #[allow(clippy::octal_escapes)] pub static
         __WIT_BINDGEN_COMPONENT_TYPE : [u8; 10773] = *
         b"\
@@ -387,8 +387,8 @@ nsecure-random-u64\x01\x02\x03\0\x1awasi:random/insecure@0.2.4\x05*\x01B\x03\x01
 o\x02ww\x01@\0\0\0\x04\0\x0dinsecure-seed\x01\x01\x03\0\x1fwasi:random/insecure-\
 seed@0.2.4\x05+\x01B\x03\x01j\0\0\x01@\0\0\0\x04\0\x03run\x01\x01\x04\0\x12wasi:\
 cli/run@0.2.4\x05,\x04\0\x16wasi:cli/command@0.2.4\x04\0\x0b\x0d\x01\0\x07comman\
-d\x03\0\0\0G\x09producers\x01\x0cprocessed-by\x02\x0dwit-component\x070.241.2\x10\
-wit-bindgen-rust\x060.48.0";
+d\x03\0\0\0G\x09producers\x01\x0cprocessed-by\x02\x0dwit-component\x070.244.0\x10\
+wit-bindgen-rust\x060.51.0";
         };
     };
 }
@@ -397,8 +397,8 @@ pub use __export_command_impl as _export_command;
 #[rustfmt::skip]
 #[cfg(target_arch = "wasm32")]
 
-#[cfg_attr(feature = "rustc-dep-of-std", unsafe(link_section = "component-type:wit-bindgen:0.48.0:wasi:cli@0.2.4:command-with-all-of-its-exports-removed:encoded worldrust-wasip2-1.0.1+wasi-0.2.4-from-crates-io-command-world-in-libstd"))]
-#[cfg_attr(not(feature = "rustc-dep-of-std"), unsafe(link_section = "component-type:wit-bindgen:0.48.0:wasi:cli@0.2.4:command-with-all-of-its-exports-removed:encoded worldrust-wasip2-1.0.1+wasi-0.2.4-from-crates-io-command-world"))]
+#[cfg_attr(feature = "rustc-dep-of-std", unsafe(link_section = "component-type:wit-bindgen:0.51.0:wasi:cli@0.2.4:command-with-all-of-its-exports-removed:encoded worldrust-wasip2-1.0.1+wasi-0.2.4-from-crates-io-command-world-in-libstd"))]
+#[cfg_attr(not(feature = "rustc-dep-of-std"), unsafe(link_section = "component-type:wit-bindgen:0.51.0:wasi:cli@0.2.4:command-with-all-of-its-exports-removed:encoded worldrust-wasip2-1.0.1+wasi-0.2.4-from-crates-io-command-world"))]
 
 #[doc(hidden)]
 #[allow(clippy::octal_escapes)]
@@ -619,7 +619,7 @@ nsecure-random-u64\x01\x02\x03\0\x1awasi:random/insecure@0.2.4\x05*\x01B\x03\x01
 o\x02ww\x01@\0\0\0\x04\0\x0dinsecure-seed\x01\x01\x03\0\x1fwasi:random/insecure-\
 seed@0.2.4\x05+\x04\06wasi:cli/command-with-all-of-its-exports-removed@0.2.4\x04\
 \0\x0b-\x01\0'command-with-all-of-its-exports-removed\x03\0\0\0G\x09producers\x01\
-\x0cprocessed-by\x02\x0dwit-component\x070.241.2\x10wit-bindgen-rust\x060.48.0";
+\x0cprocessed-by\x02\x0dwit-component\x070.244.0\x10wit-bindgen-rust\x060.51.0";
 #[inline(never)]
 #[doc(hidden)]
 pub fn __link_custom_section_describing_imports() {