Add a wasip3 crate alongside others

This refactors the repository to move the WASIp2 WITs into the `wasip2`
crate itself. A new `wasip3` crate is added and the CI scripts are
updated to generate that crate as well. The `wasip3` crate is heavily
reused from the `wasip2` crate with minor changes here and there.

Author: alexcrichton

.gitattributes

@@ -1,7 +1,9 @@
 # These are generated by `wit-bindgen`
-src/bindings.rs linguist-generated=true
+src/imports.rs linguist-generated=true
 src/proxy.rs linguist-generated=true
 src/command.rs linguist-generated=true
 
+lib_generated.rs linguist-generated=true
+
 # This is copied from other repos so diffs aren't super interesting by default
 wit/deps linguist-generated=true

.github/workflows/main.yml

@@ -40,11 +40,11 @@ jobs:
 
     - run: cargo build -p wasip2 --examples --target wasm32-unknown-unknown --no-default-features
     - run: wasm-tools component new ./target/wasm32-unknown-unknown/debug/examples/http_proxy_no_std.wasm -o component.wasm
-    - run: wasm-tools component targets wit component.wasm -w wasi:http/proxy
+    - run: wasm-tools component targets ./crates/wasip2/wit component.wasm -w wasi:http/proxy
 
     - run: cargo build -p wasip2 --examples --target wasm32-unknown-unknown
     - run: wasm-tools component new ./target/wasm32-unknown-unknown/debug/examples/http_proxy.wasm -o component.wasm
-    - run: wasm-tools component targets wit component.wasm -w wasi:http/proxy
+    - run: wasm-tools component targets ./crates/wasip2/wit component.wasm -w wasi:http/proxy
 
     - run: cargo build -p wasi-ext --examples --target wasm32-wasip2 --features rand
     - run: wasmtime run ./target/wasm32-wasip2/debug/examples/rand.wasm
@@ -55,7 +55,12 @@ jobs:
     strategy:
       matrix:
         rust: [msrv, stable, beta, nightly]
-        crate: [wasi, wasip1, wasip2]
+        crate: [wasi, wasip1, wasip2, wasip3]
+        exclude:
+          # wasip3 bindings require a newer rust feature than msrv currently
+          # allows.
+          - rust: msrv
+            crate: wasip3
     steps:
     - uses: actions/checkout@v5
     - uses: ./.github/actions/install-rust
@@ -96,3 +101,40 @@ jobs:
       working-directory: ${{ runner.tool_cache }}
     - run: ./ci/regenerate.sh
     - run: git diff --exit-code
+
+  test_wasip3:
+    name: Test WASIp3 on ${{ matrix.rust }}
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        rust: [stable, beta, nightly]
+        exclude:
+          # rust stable is not yet new enough to support the
+          # component-model-async features needed for testing, so temporarily
+          # exclude it.
+          - rust: stable
+    steps:
+    - uses: actions/checkout@v5
+    - uses: ./.github/actions/install-rust
+      with:
+        toolchain: ${{ matrix.rust }}
+    - run: rustup target add wasm32-wasip2 wasm32-unknown-unknown
+    - run: |
+        version=dev
+
+        mkdir wasmtime
+        cd wasmtime
+        curl -o wasmtime.tar.xz -L https://github.com/bytecodealliance/wasmtime/releases/download/$version/wasmtime-$version-x86_64-linux.tar.xz
+        tar xf wasmtime.tar.xz
+        echo "PATH=$PATH:`pwd`/wasmtime-$version-x86_64-linux" >> $GITHUB_ENV
+    - name: Install wasm-tools
+      uses: bytecodealliance/actions/wasm-tools/setup@v1
+      with:
+        version: "1.238.1"
+
+    - run: cargo build -p wasip3 --examples --target wasm32-wasip2
+    - run: wasmtime run -Sp3 -Wcomponent-model-async ./target/wasm32-wasip2/debug/examples/cli_command.wasm
+
+    - run: cargo build -p wasip3 --examples --target wasm32-unknown-unknown
+    - run: wasm-tools component new ./target/wasm32-unknown-unknown/debug/examples/http_proxy.wasm -o component.wasm
+    - run: wasm-tools component targets ./crates/wasip3/wit component.wasm -w wasi:http/proxy

Cargo.toml

@@ -20,8 +20,10 @@ rust-version = "1.82.0"
 [workspace.dependencies]
 rand = { version = "0.8.5", default-features = false }
 wasi = { version = "0.14.4", path = ".", default-features = false }
+wit-bindgen = { version = "0.45.0", default-features = false }
 wasip1 = { version = "1.0.0", path = "crates/wasip1", default-features = false }
 wasip2 = { version = "1.0.0", path = "crates/wasip2", default-features = false }
+wasip3 = { version = "0.1.0", path = "crates/wasip3", default-features = false }
 core = { version = "1.0", package = "rustc-std-workspace-core" }
 alloc = { version = "1.0", package = "rustc-std-workspace-alloc" }
 

ci/regenerate.sh

@@ -5,7 +5,16 @@ set -ex
 generate() {
   file="$1"
   shift
-  wit-bindgen rust wit --out-dir crates/wasip2/src --std-feature "$@" --format
+  wit-bindgen rust "$@" --format
+}
+
+# ==============================================================================
+# WASIp2 bindings
+
+generate_p2() {
+  file="$1"
+
+  generate "$@" --std-feature ./crates/wasip2/wit --out-dir crates/wasip2/src
 
   sed -z -i 's/#\[unsafe(\n    link_section = "\(.*\)"\n)\]/\
 #[cfg_attr(feature = "rustc-dep-of-std", unsafe(link_section = "\1-in-libstd"))]\
@@ -15,7 +24,8 @@ generate() {
 
 # Generate the main body of the bindings which includes all imports from the two
 # worlds below.
-generate crates/wasip2/src/imports.rs --type-section-suffix rust-wasi-from-crates-io \
+generate_p2 crates/wasip2/src/imports.rs \
+  --type-section-suffix rust-wasi-from-crates-io \
   --generate-all \
   --world wasi:cli/imports
 
@@ -50,7 +60,7 @@ with="$with,wasi:sockets/tcp-create-socket@0.2.4=crate::sockets::tcp_create_sock
 with="$with,wasi:sockets/udp@0.2.4=crate::sockets::udp"
 with="$with,wasi:sockets/udp-create-socket@0.2.4=crate::sockets::udp_create_socket"
 with="$with,wasi:sockets/ip-name-lookup@0.2.4=crate::sockets::ip_name_lookup"
-generate crates/wasip2/src/command.rs \
+generate_p2 crates/wasip2/src/command.rs \
   --world wasi:cli/command \
   --with "$with" \
   --type-section-suffix rust-wasi-from-crates-io-command-world \
@@ -68,7 +78,61 @@ with="$with,wasi:io/error@0.2.4=crate::io::error"
 with="$with,wasi:io/poll@0.2.4=crate::io::poll"
 with="$with,wasi:io/streams@0.2.4=crate::io::streams"
 with="$with,wasi:random/random@0.2.4=crate::random::random"
-generate crates/wasip2/src/proxy.rs \
+generate_p2 crates/wasip2/src/proxy.rs \
+  --world wasi:http/proxy \
+  --with "$with" \
+  --type-section-suffix rust-wasi-from-crates-io-proxy-world \
+  --default-bindings-module '$crate' \
+  --pub-export-macro \
+  --export-macro-name _export_proxy
+
+# ==============================================================================
+# WASIp3 bindings
+
+generate_p3() {
+  generate "$@" ./crates/wasip3/wit --out-dir crates/wasip3/src
+}
+
+generate_p3 crates/wasip3/src/imports.rs \
+  --type-section-suffix rust-wasi-from-crates-io \
+  --generate-all \
+  --world wasi:cli/imports
+
+with="wasi:cli/environment@0.3.0-rc-2025-08-15=crate::cli::environment"
+with="$with,wasi:cli/exit@0.3.0-rc-2025-08-15=crate::cli::exit"
+with="$with,wasi:cli/stdin@0.3.0-rc-2025-08-15=crate::cli::stdin"
+with="$with,wasi:cli/stdout@0.3.0-rc-2025-08-15=crate::cli::stdout"
+with="$with,wasi:cli/stderr@0.3.0-rc-2025-08-15=crate::cli::stderr"
+with="$with,wasi:cli/terminal-input@0.3.0-rc-2025-08-15=crate::cli::terminal_input"
+with="$with,wasi:cli/terminal-output@0.3.0-rc-2025-08-15=crate::cli::terminal_output"
+with="$with,wasi:cli/terminal-stdin@0.3.0-rc-2025-08-15=crate::cli::terminal_stdin"
+with="$with,wasi:cli/terminal-stdout@0.3.0-rc-2025-08-15=crate::cli::terminal_stdout"
+with="$with,wasi:cli/terminal-stderr@0.3.0-rc-2025-08-15=crate::cli::terminal_stderr"
+with="$with,wasi:clocks/monotonic-clock@0.3.0-rc-2025-08-15=crate::clocks::monotonic_clock"
+with="$with,wasi:clocks/wall-clock@0.3.0-rc-2025-08-15=crate::clocks::wall_clock"
+with="$with,wasi:filesystem/types@0.3.0-rc-2025-08-15=crate::filesystem::types"
+with="$with,wasi:filesystem/preopens@0.3.0-rc-2025-08-15=crate::filesystem::preopens"
+with="$with,wasi:random/random@0.3.0-rc-2025-08-15=crate::random::random"
+with="$with,wasi:random/insecure@0.3.0-rc-2025-08-15=crate::random::insecure"
+with="$with,wasi:random/insecure-seed@0.3.0-rc-2025-08-15=crate::random::insecure_seed"
+with="$with,wasi:sockets/types@0.3.0-rc-2025-08-15=crate::sockets::types"
+with="$with,wasi:sockets/ip-name-lookup@0.3.0-rc-2025-08-15=crate::sockets::ip_name_lookup"
+generate_p3 crates/wasip3/src/command.rs \
+  --world wasi:cli/command \
+  --with "$with" \
+  --type-section-suffix rust-wasi-from-crates-io-command-world \
+  --default-bindings-module '$crate' \
+  --pub-export-macro \
+  --async 'wasi:cli/run@0.3.0-rc-2025-08-15#run' \
+  --export-macro-name _export_command
+
+with="wasi:cli/stdin@0.3.0-rc-2025-08-15=crate::cli::stdin"
+with="$with,wasi:cli/stdout@0.3.0-rc-2025-08-15=crate::cli::stdout"
+with="$with,wasi:cli/stderr@0.3.0-rc-2025-08-15=crate::cli::stderr"
+with="$with,wasi:clocks/monotonic-clock@0.3.0-rc-2025-08-15=crate::clocks::monotonic_clock"
+with="$with,wasi:clocks/wall-clock@0.3.0-rc-2025-08-15=crate::clocks::wall_clock"
+with="$with,wasi:random/random@0.3.0-rc-2025-08-15=crate::random::random"
+generate_p3 crates/wasip3/src/proxy.rs \
   --world wasi:http/proxy \
   --with "$with" \
   --type-section-suffix rust-wasi-from-crates-io-proxy-world \

ci/vendor-wit.sh

@@ -13,19 +13,28 @@ set -ex
 # 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.
-repos="cli clocks filesystem http io random sockets"
 tag=0.2.4
 dst=wit/deps
 
-rm -rf $dst
-mkdir -p $dst
+vendor() {
+  dst="$1"
+  tag="$2"
+  subdir="$3"
+  repos="$4"
 
-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/wit
-  rm -rf $dst/$repo/deps*
-done
+  rm -rf $dst
+  mkdir -p $dst
+
+  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
+}
+
+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-08-15 wit-0.3.0-draft "cli clocks filesystem http random sockets"
 
 # WASIp1 vendoring logic
 wasip1_rev="0ba0c5e2"

crates/wasip2/Cargo.toml

@@ -12,7 +12,7 @@ repository.workspace = true
 rust-version.workspace = true
 
 [dependencies]
-wit-bindgen = { version = "0.45.0", default-features = false }
+wit-bindgen = { workspace = true }
 
 # When built as part of libstd
 core = { optional = true, workspace = true }