Update WIT in tests with async

.github/workflows/main.yml

@@ -103,7 +103,7 @@ jobs:
     - uses: ./.github/actions/install-rust
     - run: |
         set -e
-        curl -L https://github.com/EmbarkStudios/cargo-deny/releases/download/0.14.5/cargo-deny-0.14.5-x86_64-unknown-linux-musl.tar.gz | tar xzf -
+        curl -L https://github.com/EmbarkStudios/cargo-deny/releases/download/0.18.2/cargo-deny-0.18.2-x86_64-unknown-linux-musl.tar.gz | tar xzf -
         mv cargo-deny-*-x86_64-unknown-linux-musl/cargo-deny cargo-deny
         echo `pwd` >> $GITHUB_PATH
     - run: cargo deny check bans licenses

Cargo.toml

@@ -608,9 +608,9 @@ wit-component = { git = "https://github.com/bytecodealliance/wasm-tools" }
 wasm-wave = { git = "https://github.com/bytecodealliance/wasm-tools" }
 wasm-compose = { git = "https://github.com/bytecodealliance/wasm-tools" }
 wasm-metadata = { git = "https://github.com/bytecodealliance/wasm-tools" }
-wit-bindgen = { git = "https://github.com/bytecodealliance/witx-bindgen" }
-wit-bindgen-rt = { git = "https://github.com/bytecodealliance/witx-bindgen" }
-wit-bindgen-rust-macro = { git = "https://github.com/bytecodealliance/witx-bindgen" }
+wit-bindgen = { git = "https://github.com/bytecodealliance/wit-bindgen" }
+wit-bindgen-rt = { git = "https://github.com/bytecodealliance/wit-bindgen" }
+wit-bindgen-rust-macro = { git = "https://github.com/bytecodealliance/wit-bindgen" }
 
 # wasmparser = { path = '../wasm-tools/crates/wasmparser' }
 # wat = { path = '../wasm-tools/crates/wat' }

ci/vendor-wit.sh

@@ -68,22 +68,23 @@ make_vendor "wasi-config" "config@f4d699b"
 
 make_vendor "wasi-keyvalue" "keyvalue@219ea36"
 
-make_vendor "wasi/src/p3" "
-    cli@82b86d9@wit-0.3.0-draft
-    clocks@646092f@wit-0.3.0-draft
-    filesystem@740cd76@wit-0.3.0-draft
-    random@9499404@wit-0.3.0-draft
-    sockets@41d7079@wit-0.3.0-draft
-"
+# TODO: upstream `async` changes and eventually re-enable this
+# make_vendor "wasi/src/p3" "
+#     cli@82b86d9@wit-0.3.0-draft
+#     clocks@646092f@wit-0.3.0-draft
+#     filesystem@740cd76@wit-0.3.0-draft
+#     random@9499404@wit-0.3.0-draft
+#     sockets@41d7079@wit-0.3.0-draft
+# "
 # `wasi:http` from https://github.com/WebAssembly/wasi-http/pull/158
-make_vendor "wasi-http/src/p3" "
-    cli@82b86d9@wit-0.3.0-draft
-    clocks@646092f@wit-0.3.0-draft
-    filesystem@740cd76@wit-0.3.0-draft
-    random@9499404@wit-0.3.0-draft
-    sockets@41d7079@wit-0.3.0-draft
-    http@ae89575@wit-0.3.0-draft
-"
+# make_vendor "wasi-http/src/p3" "
+#     cli@82b86d9@wit-0.3.0-draft
+#     clocks@646092f@wit-0.3.0-draft
+#     filesystem@740cd76@wit-0.3.0-draft
+#     random@9499404@wit-0.3.0-draft
+#     sockets@41d7079@wit-0.3.0-draft
+#     http@ae89575@wit-0.3.0-draft
+# "
 
 rm -rf $cache_dir
 

crates/misc/component-async-tests/http/src/lib.rs

@@ -13,7 +13,7 @@ wasmtime::component::bindgen!({
             "wasi:http/types@0.3.0-draft#[constructor]body",
             "wasi:http/types@0.3.0-draft#[static]body.new-with-trailers",
             "wasi:http/types@0.3.0-draft#[static]body.finish",
-            "wasi:http/handler@0.3.0-draft#handle",
+            "wasi:http/handler@0.3.0-draft#[async]handle",
         ]
     },
     with: {

crates/misc/component-async-tests/src/sleep.rs

@@ -10,7 +10,7 @@ wasmtime::component::bindgen!({
     concurrent_exports: true,
     async: {
         only_imports: [
-            "local:local/sleep#sleep-millis",
+            "local:local/sleep#[async]sleep-millis",
         ]
     },
 });

crates/misc/component-async-tests/src/yield_host.rs

@@ -14,7 +14,7 @@ pub mod bindings {
         concurrent_exports: true,
         async: {
             only_imports: [
-                "local:local/ready#when-ready",
+                "local:local/ready#[async]when-ready",
             ]
         },
     });