Update WIT in tests with async

This commit updates the WIT used in test to use the `async` keyword and
generally try to avoid manually configuring what's async and what's not
in the guest. This does not update the host's handling of the `async`
keyword in WIT for `wasmtime::component::bindgen!`. Some assorted
bindgen issues were fixed here and there and WASI WITs were updated as
well with `async` where it seemed appropriate. I'll note that there are
some usages of concurrent imports when there's no actual concurrency,
it's just there for getting an `Accessor` and, for example, spawning
tasks. In these situations we may want to explore possible modes of
bindings generation on the host side of things which avoids the need for
manual configuration.

Coupled with bytecodealliance/wit-bindgen#1278 and
bytecodealliance/wit-bindgen#1279.

Author: alexcrichton

Cargo.lock

@@ -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' }

Cargo.toml

@@ -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/http/src/lib.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/sleep.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",
             ]
         },
     });

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

@@ -347,7 +347,7 @@ pub async fn test_round_trip(component: &[u8], inputs_and_outputs: &[(&str, &str
         linker
             .root()
             .instance("local:local/baz")?
-            .func_new_concurrent("foo", |_, params| {
+            .func_new_concurrent("[async]foo", |_, params| {
                 Box::pin(async move {
                     tokio::time::sleep(Duration::from_millis(10)).await;
                     let Some(Val::String(s)) = params.into_iter().next() else {
@@ -366,7 +366,7 @@ pub async fn test_round_trip(component: &[u8], inputs_and_outputs: &[(&str, &str
             .get_export_index(&mut store, None, "local:local/baz")
             .ok_or_else(|| anyhow!("can't find `local:local/baz` in instance"))?;
         let foo_function = instance
-            .get_export_index(&mut store, Some(&baz_instance), "foo")
+            .get_export_index(&mut store, Some(&baz_instance), "[async]foo")
             .ok_or_else(|| anyhow!("can't find `foo` in instance"))?;
         let foo_function = instance
             .get_func(&mut store, foo_function)

crates/misc/component-async-tests/tests/scenario/round_trip.rs

@@ -306,7 +306,7 @@ async fn test_round_trip_many(component: &[u8], inputs_and_outputs: &[(&str, &st
         linker
             .root()
             .instance("local:local/many")?
-            .func_new_concurrent("foo", |_, params| {
+            .func_new_concurrent("[async]foo", |_, params| {
                 Box::pin(async move {
                     tokio::time::sleep(Duration::from_millis(10)).await;
                     let mut params = params.into_iter();
@@ -328,7 +328,7 @@ async fn test_round_trip_many(component: &[u8], inputs_and_outputs: &[(&str, &st
             .get_export_index(&mut store, None, "local:local/many")
             .ok_or_else(|| anyhow!("can't find `local:local/many` in instance"))?;
         let foo_function = instance
-            .get_export_index(&mut store, Some(&baz_instance), "foo")
+            .get_export_index(&mut store, Some(&baz_instance), "[async]foo")
             .ok_or_else(|| anyhow!("can't find `foo` in instance"))?;
         let foo_function = instance
             .get_func(&mut store, foo_function)

crates/misc/component-async-tests/tests/scenario/round_trip_many.rs

@@ -241,7 +241,11 @@ impl TransmitTest for DynamicTransmitTest {
                 .get_export_index(store.as_context_mut(), None, "local:local/transmit")
                 .ok_or_else(|| anyhow!("can't find `local:local/transmit` in instance"))?;
             let exchange_function = instance
-                .get_export_index(store.as_context_mut(), Some(&transmit_instance), "exchange")
+                .get_export_index(
+                    store.as_context_mut(),
+                    Some(&transmit_instance),
+                    "[async]exchange",
+                )
                 .ok_or_else(|| anyhow!("can't find `exchange` in instance"))?;
             instance
                 .get_func(store.as_context_mut(), exchange_function)