Bump WASI version to 0.2.2

.github/workflows/main.yml

@@ -21,12 +21,12 @@ jobs:
     - name: Install Wasmtime
       uses: bytecodealliance/actions/wasmtime/setup@v1
       with:
-        version: "v23.0.1"
+        version: "v25.0.1"
     - name: Install wasm-tools
       uses: bytecodealliance/actions/wasm-tools/setup@v1
       with:
-        version: "1.215.0"
-    - run: curl -LO https://github.com/bytecodealliance/wasmtime/releases/download/v23.0.1/wasi_snapshot_preview1.command.wasm
+        version: "1.218.0"
+    - run: curl -LO https://github.com/bytecodealliance/wasmtime/releases/download/v25.0.1/wasi_snapshot_preview1.command.wasm
 
     - run: cargo build --examples --target wasm32-wasip1 --no-default-features
 
@@ -72,6 +72,6 @@ jobs:
       run: |
         ./ci/vendor-wit.sh
         git diff --exit-code
-    - run: cargo install wit-bindgen-cli@0.29.0 --locked
+    - run: cargo install wit-bindgen-cli@0.33.0 --locked
     - run: ./ci/regenerate.sh
     - run: git diff --exit-code

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "wasi"
-version = "0.13.2+wasi-0.2.1"
+version = "0.13.3+wasi-0.2.2"
 authors = ["The Cranelift Project Developers"]
 description = "WASI API bindings for Rust"
 categories = ["no-std", "wasm"]
@@ -24,7 +24,7 @@ wasi = { version = "0.13", path = ".", default-features = false }
 members = ["./crates/*"]
 
 [dependencies]
-wit-bindgen-rt = { version = "0.29.0", features = ["bitflags"] }
+wit-bindgen-rt = { version = "0.33.0", features = ["bitflags"] }
 
 # When built as part of libstd
 compiler_builtins = { version = "0.1", optional = true }

ci/regenerate.sh

@@ -18,33 +18,33 @@ generate src/bindings.rs --type-section-suffix rust-wasi-from-crates-io \
 # macro `export_command`.
 #
 # Note that `--with` is used to point at the previously generated bindings.
-with="wasi:cli/[email protected].1=crate::cli::environment"
-with="$with,wasi:cli/[email protected].1=crate::cli::exit"
-with="$with,wasi:cli/[email protected].1=crate::cli::stdin"
-with="$with,wasi:cli/[email protected].1=crate::cli::stdout"
-with="$with,wasi:cli/[email protected].1=crate::cli::stderr"
-with="$with,wasi:cli/[email protected].1=crate::cli::terminal_input"
-with="$with,wasi:cli/[email protected].1=crate::cli::terminal_output"
-with="$with,wasi:cli/[email protected].1=crate::cli::terminal_stdin"
-with="$with,wasi:cli/[email protected].1=crate::cli::terminal_stdout"
-with="$with,wasi:cli/[email protected].1=crate::cli::terminal_stderr"
-with="$with,wasi:clocks/[email protected].1=crate::clocks::monotonic_clock"
-with="$with,wasi:clocks/[email protected].1=crate::clocks::wall_clock"
-with="$with,wasi:filesystem/[email protected].1=crate::filesystem::types"
-with="$with,wasi:filesystem/[email protected].1=crate::filesystem::preopens"
-with="$with,wasi:io/[email protected].1=crate::io::error"
-with="$with,wasi:io/[email protected].1=crate::io::poll"
-with="$with,wasi:io/[email protected].1=crate::io::streams"
-with="$with,wasi:random/[email protected].1=crate::random::random"
-with="$with,wasi:random/[email protected].1=crate::random::insecure"
-with="$with,wasi:random/[email protected].1=crate::random::insecure_seed"
-with="$with,wasi:sockets/[email protected].1=crate::sockets::network"
-with="$with,wasi:sockets/[email protected].1=crate::sockets::instance_network"
-with="$with,wasi:sockets/[email protected].1=crate::sockets::tcp"
-with="$with,wasi:sockets/[email protected].1=crate::sockets::tcp_create_socket"
-with="$with,wasi:sockets/[email protected].1=crate::sockets::udp"
-with="$with,wasi:sockets/[email protected].1=crate::sockets::udp_create_socket"
-with="$with,wasi:sockets/[email protected].1=crate::sockets::ip_name_lookup"
+with="wasi:cli/[email protected].2=crate::cli::environment"
+with="$with,wasi:cli/[email protected].2=crate::cli::exit"
+with="$with,wasi:cli/[email protected].2=crate::cli::stdin"
+with="$with,wasi:cli/[email protected].2=crate::cli::stdout"
+with="$with,wasi:cli/[email protected].2=crate::cli::stderr"
+with="$with,wasi:cli/[email protected].2=crate::cli::terminal_input"
+with="$with,wasi:cli/[email protected].2=crate::cli::terminal_output"
+with="$with,wasi:cli/[email protected].2=crate::cli::terminal_stdin"
+with="$with,wasi:cli/[email protected].2=crate::cli::terminal_stdout"
+with="$with,wasi:cli/[email protected].2=crate::cli::terminal_stderr"
+with="$with,wasi:clocks/[email protected].2=crate::clocks::monotonic_clock"
+with="$with,wasi:clocks/[email protected].2=crate::clocks::wall_clock"
+with="$with,wasi:filesystem/[email protected].2=crate::filesystem::types"
+with="$with,wasi:filesystem/[email protected].2=crate::filesystem::preopens"
+with="$with,wasi:io/[email protected].2=crate::io::error"
+with="$with,wasi:io/[email protected].2=crate::io::poll"
+with="$with,wasi:io/[email protected].2=crate::io::streams"
+with="$with,wasi:random/[email protected].2=crate::random::random"
+with="$with,wasi:random/[email protected].2=crate::random::insecure"
+with="$with,wasi:random/[email protected].2=crate::random::insecure_seed"
+with="$with,wasi:sockets/[email protected].2=crate::sockets::network"
+with="$with,wasi:sockets/[email protected].2=crate::sockets::instance_network"
+with="$with,wasi:sockets/[email protected].2=crate::sockets::tcp"
+with="$with,wasi:sockets/[email protected].2=crate::sockets::tcp_create_socket"
+with="$with,wasi:sockets/[email protected].2=crate::sockets::udp"
+with="$with,wasi:sockets/[email protected].2=crate::sockets::udp_create_socket"
+with="$with,wasi:sockets/[email protected].2=crate::sockets::ip_name_lookup"
 generate src/command.rs \
   --world wasi:cli/command \
   --with "$with" \
@@ -54,17 +54,17 @@ generate src/command.rs \
   --export-macro-name _export_command
 
 # Same as the `command` world, but for the proxy world.
-with="wasi:cli/[email protected].1=crate::cli::stdin"
-with="$with,wasi:cli/[email protected].1=crate::cli::stdout"
-with="$with,wasi:cli/[email protected].1=crate::cli::stderr"
-with="$with,wasi:clocks/[email protected].1=crate::clocks::monotonic_clock"
-with="$with,wasi:clocks/[email protected].1=crate::clocks::wall_clock"
-with="$with,wasi:io/[email protected].1=crate::io::error"
-with="$with,wasi:io/[email protected].1=crate::io::poll"
-with="$with,wasi:io/[email protected].1=crate::io::streams"
-with="$with,wasi:random/[email protected].1=crate::random::random"
-with="$with,wasi:http/[email protected].1=crate::http::types"
-with="$with,wasi:http/[email protected].1=crate::http::outgoing_handler"
+with="wasi:cli/[email protected].2=crate::cli::stdin"
+with="$with,wasi:cli/[email protected].2=crate::cli::stdout"
+with="$with,wasi:cli/[email protected].2=crate::cli::stderr"
+with="$with,wasi:clocks/[email protected].2=crate::clocks::monotonic_clock"
+with="$with,wasi:clocks/[email protected].2=crate::clocks::wall_clock"
+with="$with,wasi:io/[email protected].2=crate::io::error"
+with="$with,wasi:io/[email protected].2=crate::io::poll"
+with="$with,wasi:io/[email protected].2=crate::io::streams"
+with="$with,wasi:random/[email protected].2=crate::random::random"
+with="$with,wasi:http/[email protected].2=crate::http::types"
+with="$with,wasi:http/[email protected].2=crate::http::outgoing_handler"
 generate src/proxy.rs \
   --world wasi:http/proxy \
   --with "$with" \

ci/vendor-wit.sh

@@ -14,7 +14,7 @@ set -ex
 # 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.1
+tag=0.2.2
 dst=wit/deps
 
 rm -rf $dst