Update in-tree wit-bindgen to 0.11.0 (bytecodealliance#6947)

This only affects tests and the adapter itself, but not in any breaking way. The tests for wasi-http are reorganized to be commands which is also required to not have any exports currently since wit-bindgen for Rust guests doesn't support generating bindings in one crate and exporting in another.
gurry · Sep 6, 2023 · e4fbf97 · e4fbf97
1 parent 6ca7493
commit e4fbf97
Show file tree

Hide file tree

Showing 20 changed files with 162 additions and 267 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -207,7 +207,7 @@ io-extras = "0.18.0"
 rustix = "0.38.8"
 is-terminal = "0.4.0"
 # wit-bindgen:
-wit-bindgen = { version = "0.9.0", default-features = false }
+wit-bindgen = { version = "0.11.0", default-features = false }
 
 # wasm-tools family:
 wasmparser = "0.112.0"
@@ -328,3 +328,10 @@ debug-assertions = false
 # Omit integer overflow checks, which include failure messages which require
 # string initializers.
 overflow-checks = false
+
+# Same as `wasi-preview1-component-adapter` above
+[profile.dev.package.wit-bindgen]
+incremental = false
+debug-assertions = false
+overflow-checks = false
+opt-level = 's'
diff --git a/crates/test-programs/build.rs b/crates/test-programs/build.rs
@@ -61,7 +61,7 @@ fn build_and_generate_tests() {
 
     if BUILD_WASI_HTTP_TESTS {
         modules_rs(&meta, "wasi-http-tests", "bin", &out_dir);
-        components_rs(&meta, "wasi-http-tests", "bin", &reactor_adapter, &out_dir);
+        components_rs(&meta, "wasi-http-tests", "bin", &command_adapter, &out_dir);
     }
 
     components_rs(&meta, "command-tests", "bin", &command_adapter, &out_dir);

diff --git a/crates/test-programs/reactor-tests/src/lib.rs b/crates/test-programs/reactor-tests/src/lib.rs
@@ -1,12 +1,16 @@
-wit_bindgen::generate!("test-reactor" in "../../wasi/wit");
-
-export_test_reactor!(T);
+wit_bindgen::generate!({
+    world: "test-reactor",
+    path: "../../wasi/wit",
+    exports: {
+        world: T,
+    }
+});
 
 struct T;
 
 static mut STATE: Vec<String> = Vec::new();
 
-impl TestReactor for T {
+impl Guest for T {
     fn add_strings(ss: Vec<String>) -> u32 {
         for s in ss {
             match s.split_once("$") {

diff --git a/crates/test-programs/tests/wasi-http-modules.rs b/crates/test-programs/tests/wasi-http-modules.rs
@@ -69,7 +69,7 @@ async fn instantiate_module(module: Module, ctx: Ctx) -> Result<(Store<Ctx>, Fun
     let mut store = Store::new(&ENGINE, ctx);
 
     let instance = linker.instantiate_async(&mut store, &module).await?;
-    let command = instance.get_func(&mut store, "wasi:cli/run#run").unwrap();
+    let command = instance.get_func(&mut store, "_start").unwrap();
     Ok((store, command))
 }
 
@@ -103,9 +103,7 @@ async fn run(name: &str) -> anyhow::Result<()> {
             },
         )
         .await?;
-        command
-            .call_async(&mut store, &[], &mut [wasmtime::Val::null()])
-            .await
+        command.call_async(&mut store, &[], &mut []).await
     };
     r.map_err(move |trap: anyhow::Error| {
         let stdout = stdout.try_into_inner().expect("single ref to stdout");

diff --git a/crates/test-programs/wasi-http-tests/src/bin/outbound_request_get.rs b/crates/test-programs/wasi-http-tests/src/bin/outbound_request_get.rs
@@ -1,11 +1,11 @@
-use anyhow::{Context, Result};
+use anyhow::Context;
 use wasi_http_tests::bindings::wasi::http::types::{Method, Scheme};
 
-struct Component;
-
-fn main() {}
+fn main() {
+    wasi_http_tests::in_tokio(async { run().await })
+}
 
-async fn run() -> Result<(), ()> {
+async fn run() {
     let res = wasi_http_tests::request(
         Method::Get,
         Scheme::Http,
@@ -28,14 +28,4 @@ async fn run() -> Result<(), ()> {
         "http://localhost:3000/get?some=arg&goes=here"
     );
     assert_eq!(res.body, b"");
-
-    Ok(())
 }
-
-impl wasi_http_tests::bindings::exports::wasi::cli::run::Run for Component {
-    fn run() -> Result<(), ()> {
-        wasi_http_tests::in_tokio(async { run().await })
-    }
-}
-
-wasi_http_tests::export_command_extended!(Component);
diff --git a/crates/test-programs/wasi-http-tests/src/bin/outbound_request_invalid_dnsname.rs b/crates/test-programs/wasi-http-tests/src/bin/outbound_request_invalid_dnsname.rs
@@ -1,11 +1,10 @@
-use anyhow::Result;
 use wasi_http_tests::bindings::wasi::http::types::{Method, Scheme};
 
-struct Component;
-
-fn main() {}
+fn main() {
+    wasi_http_tests::in_tokio(async { run().await })
+}
 
-async fn run() -> Result<(), ()> {
+async fn run() {
     let res = wasi_http_tests::request(
         Method::Get,
         Scheme::Http,
@@ -18,14 +17,4 @@ async fn run() -> Result<(), ()> {
 
     let error = res.unwrap_err();
     assert_eq!(error.to_string(), "Error::InvalidUrl(\"invalid dnsname\")");
-
-    Ok(())
 }
-
-impl wasi_http_tests::bindings::exports::wasi::cli::run::Run for Component {
-    fn run() -> Result<(), ()> {
-        wasi_http_tests::in_tokio(async { run().await })
-    }
-}
-
-wasi_http_tests::export_command_extended!(Component);
diff --git a/crates/test-programs/wasi-http-tests/src/bin/outbound_request_invalid_port.rs b/crates/test-programs/wasi-http-tests/src/bin/outbound_request_invalid_port.rs
@@ -1,11 +1,10 @@
-use anyhow::Result;
 use wasi_http_tests::bindings::wasi::http::types::{Method, Scheme};
 
-struct Component;
-
-fn main() {}
+fn main() {
+    wasi_http_tests::in_tokio(async { run().await })
+}
 
-async fn run() -> Result<(), ()> {
+async fn run() {
     let res = wasi_http_tests::request(
         Method::Get,
         Scheme::Http,
@@ -21,14 +20,4 @@ async fn run() -> Result<(), ()> {
         error.to_string(),
         "Error::InvalidUrl(\"invalid port value\")"
     );
-
-    Ok(())
 }
-
-impl wasi_http_tests::bindings::exports::wasi::cli::run::Run for Component {
-    fn run() -> Result<(), ()> {
-        wasi_http_tests::in_tokio(async { run().await })
-    }
-}
-
-wasi_http_tests::export_command_extended!(Component);
diff --git a/crates/test-programs/wasi-http-tests/src/bin/outbound_request_invalid_version.rs b/crates/test-programs/wasi-http-tests/src/bin/outbound_request_invalid_version.rs
@@ -1,11 +1,10 @@
-use anyhow::Result;
 use wasi_http_tests::bindings::wasi::http::types::{Method, Scheme};
 
-struct Component;
-
-fn main() {}
+fn main() {
+    wasi_http_tests::in_tokio(async { run().await })
+}
 
-async fn run() -> Result<(), ()> {
+async fn run() {
     let res = wasi_http_tests::request(
         Method::Connect,
         Scheme::Http,
@@ -27,14 +26,4 @@ async fn run() -> Result<(), ()> {
             or `"Error::ProtocolError(\"operation was canceled\")"`)"#
         )
     }
-
-    Ok(())
 }
-
-impl wasi_http_tests::bindings::exports::wasi::cli::run::Run for Component {
-    fn run() -> Result<(), ()> {
-        wasi_http_tests::in_tokio(async { run().await })
-    }
-}
-
-wasi_http_tests::export_command_extended!(Component);
diff --git a/crates/test-programs/wasi-http-tests/src/bin/outbound_request_post.rs b/crates/test-programs/wasi-http-tests/src/bin/outbound_request_post.rs
@@ -1,11 +1,11 @@
-use anyhow::{Context, Result};
+use anyhow::Context;
 use wasi_http_tests::bindings::wasi::http::types::{Method, Scheme};
 
-struct Component;
-
-fn main() {}
+fn main() {
+    wasi_http_tests::in_tokio(async { run().await })
+}
 
-async fn run() -> Result<(), ()> {
+async fn run() {
     let res = wasi_http_tests::request(
         Method::Post,
         Scheme::Http,
@@ -23,14 +23,4 @@ async fn run() -> Result<(), ()> {
     let method = res.header("x-wasmtime-test-method").unwrap();
     assert_eq!(std::str::from_utf8(method).unwrap(), "POST");
     assert_eq!(res.body, b"{\"foo\": \"bar\"}");
-
-    Ok(())
 }
-
-impl wasi_http_tests::bindings::exports::wasi::cli::run::Run for Component {
-    fn run() -> Result<(), ()> {
-        wasi_http_tests::in_tokio(async { run().await })
-    }
-}
-
-wasi_http_tests::export_command_extended!(Component);
diff --git a/crates/test-programs/wasi-http-tests/src/bin/outbound_request_post_large.rs b/crates/test-programs/wasi-http-tests/src/bin/outbound_request_post_large.rs
@@ -4,9 +4,11 @@ use wasi_http_tests::bindings::wasi::http::types::{Method, Scheme};
 
 struct Component;
 
-fn main() {}
+fn main() {
+    wasi_http_tests::in_tokio(async { run().await })
+}
 
-async fn run() -> Result<(), ()> {
+async fn run() {
     const LEN: usize = 4000;
     let mut buffer = [0; LEN];
     io::repeat(0b001).read_exact(&mut buffer).unwrap();
@@ -27,14 +29,4 @@ async fn run() -> Result<(), ()> {
     let method = res.header("x-wasmtime-test-method").unwrap();
     assert_eq!(std::str::from_utf8(method).unwrap(), "POST");
     assert_eq!(res.body.len(), LEN);
-
-    Ok(())
 }
-
-impl wasi_http_tests::bindings::exports::wasi::cli::run::Run for Component {
-    fn run() -> Result<(), ()> {
-        wasi_http_tests::in_tokio(async { run().await })
-    }
-}
-
-wasi_http_tests::export_command_extended!(Component);
diff --git a/crates/test-programs/wasi-http-tests/src/bin/outbound_request_put.rs b/crates/test-programs/wasi-http-tests/src/bin/outbound_request_put.rs
@@ -1,11 +1,11 @@
-use anyhow::{Context, Result};
+use anyhow::Context;
 use wasi_http_tests::bindings::wasi::http::types::{Method, Scheme};
 
-struct Component;
-
-fn main() {}
+fn main() {
+    wasi_http_tests::in_tokio(async { run().await })
+}
 
-async fn run() -> Result<(), ()> {
+async fn run() {
     let res = wasi_http_tests::request(
         Method::Put,
         Scheme::Http,
@@ -23,14 +23,4 @@ async fn run() -> Result<(), ()> {
     let method = res.header("x-wasmtime-test-method").unwrap();
     assert_eq!(std::str::from_utf8(method).unwrap(), "PUT");
     assert_eq!(res.body, b"");
-
-    Ok(())
 }
-
-impl wasi_http_tests::bindings::exports::wasi::cli::run::Run for Component {
-    fn run() -> Result<(), ()> {
-        wasi_http_tests::in_tokio(async { run().await })
-    }
-}
-
-wasi_http_tests::export_command_extended!(Component);
diff --git a/crates/test-programs/wasi-http-tests/src/bin/outbound_request_unknown_method.rs b/crates/test-programs/wasi-http-tests/src/bin/outbound_request_unknown_method.rs
@@ -1,11 +1,10 @@
-use anyhow::Result;
 use wasi_http_tests::bindings::wasi::http::types::{Method, Scheme};
 
-struct Component;
-
-fn main() {}
+fn main() {
+    wasi_http_tests::in_tokio(async { run().await })
+}
 
-async fn run() -> Result<(), ()> {
+async fn run() {
     let res = wasi_http_tests::request(
         Method::Other("OTHER".to_owned()),
         Scheme::Http,
@@ -21,14 +20,4 @@ async fn run() -> Result<(), ()> {
         error.to_string(),
         "Error::InvalidUrl(\"unknown method OTHER\")"
     );
-
-    Ok(())
 }
-
-impl wasi_http_tests::bindings::exports::wasi::cli::run::Run for Component {
-    fn run() -> Result<(), ()> {
-        wasi_http_tests::in_tokio(async { run().await })
-    }
-}
-
-wasi_http_tests::export_command_extended!(Component);
diff --git a/crates/test-programs/wasi-http-tests/src/bin/outbound_request_unsupported_scheme.rs b/crates/test-programs/wasi-http-tests/src/bin/outbound_request_unsupported_scheme.rs
@@ -1,11 +1,10 @@
-use anyhow::Result;
 use wasi_http_tests::bindings::wasi::http::types::{Method, Scheme};
 
-struct Component;
-
-fn main() {}
+fn main() {
+    wasi_http_tests::in_tokio(async { run().await })
+}
 
-async fn run() -> Result<(), ()> {
+async fn run() {
     let res = wasi_http_tests::request(
         Method::Get,
         Scheme::Other("WS".to_owned()),
@@ -21,14 +20,4 @@ async fn run() -> Result<(), ()> {
         error.to_string(),
         "Error::InvalidUrl(\"unsupported scheme WS\")"
     );
-
-    Ok(())
 }
-
-impl wasi_http_tests::bindings::exports::wasi::cli::run::Run for Component {
-    fn run() -> Result<(), ()> {
-        wasi_http_tests::in_tokio(async { run().await })
-    }
-}
-
-wasi_http_tests::export_command_extended!(Component);
diff --git a/crates/test-programs/wasi-http-tests/src/lib.rs b/crates/test-programs/wasi-http-tests/src/lib.rs
@@ -2,8 +2,8 @@ pub mod bindings {
     wit_bindgen::generate!({
         path: "../../wasi-http/wit",
         world: "wasmtime:wasi/command-extended",
-        macro_call_prefix: "::wasi_http_tests::bindings::",
-        macro_export,
+        // macro_call_prefix: "::wasi_http_tests::bindings::",
+        // macro_export,
     });
 }
 

diff --git a/crates/wasi-http/wit/command-extended.wit b/crates/wasi-http/wit/command-extended.wit
@@ -29,8 +29,6 @@ world command-extended {
   import wasi:cli/terminal-stdout
   import wasi:cli/terminal-stderr
 
-  export wasi:cli/run
-
   // We should replace all others with `include self.command`
   // as soon as the unioning of worlds is available:
   // https://github.com/WebAssembly/component-model/issues/169

diff --git a/crates/wasi-preview1-component-adapter/src/lib.rs b/crates/wasi-preview1-component-adapter/src/lib.rs
@@ -25,7 +25,7 @@ compile_error!("only one of the `command` and `reactor` features may be selected
 mod macros;
 
 mod descriptors;
-use crate::descriptors::{Descriptor, Descriptors, IsATTY, StreamType, Streams};
+use crate::descriptors::{Descriptor, Descriptors, StreamType, Streams};
 
 pub mod bindings {
     #[cfg(feature = "command")]

diff --git a/crates/wasi/wit/command-extended.wit b/crates/wasi/wit/command-extended.wit
@@ -29,8 +29,6 @@ world command-extended {
   import wasi:cli/terminal-stdout
   import wasi:cli/terminal-stderr
 
-  export wasi:cli/run
-
   // We should replace all others with `include self.command`
   // as soon as the unioning of worlds is available:
   // https://github.com/WebAssembly/component-model/issues/169