Replace WASI WITs with binary form

.github/workflows/main.yml

@@ -501,12 +501,6 @@ jobs:
         RUST_BACKTRACE: 1
       if: matrix.target == '' && matrix.os != 'windows-latest' && needs.determine.outputs.test-capi
 
-    # Ensure wit definitions are in sync: both wasmtime-wasi and wasmtime-wasi-http need their own
-    # copy of the wit definitions so publishing works, but we need to ensure they are identical copies.
-    - name: Check that the wasi and wasi-http wit directories agree
-      run: |
-        diff -ru crates/wasi/wit crates/wasi-http/wit
-
     # Record some CPU details; this is helpful information if tests fail due
     # to CPU-specific features.
     - name: CPU information

Cargo.toml

@@ -231,7 +231,7 @@ io-lifetimes = { version = "2.0.3", default-features = false }
 io-extras = "0.18.1"
 rustix = "0.38.31"
 # wit-bindgen:
-wit-bindgen = { version = "0.17.0", default-features = false }
+wit-bindgen = { version = "0.18.0", default-features = false }
 
 # wasm-tools family:
 wasmparser = "0.121.2"

crates/component-macro/src/bindgen.rs

@@ -52,13 +52,16 @@ pub fn expand(input: &Config) -> Result<TokenStream> {
     }
     let mut contents = src.parse::<TokenStream>().unwrap();
 
-    // Include a dummy `include_str!` for any files we read so rustc knows that
+    // Include a dummy `include_bytes!` for any files we read so rustc knows that
     // we depend on the contents of those files.
     for file in input.files.iter() {
         contents.extend(
-            format!("const _: &str = include_str!(r#\"{}\"#);\n", file.display())
-                .parse::<TokenStream>()
-                .unwrap(),
+            format!(
+                "const _: &[u8] = include_bytes!(r#\"{}\"#);\n",
+                file.display()
+            )
+            .parse::<TokenStream>()
+            .unwrap(),
         );
     }
 

crates/test-programs/src/bin/api_proxy.rs

@@ -2,7 +2,6 @@ pub mod bindings {
     use super::T;
 
     wit_bindgen::generate!({
-        path: "../wasi-http/wit",
         world: "wasi:http/proxy",
         exports: {
             "wasi:http/incoming-handler": T,

crates/test-programs/src/bin/api_proxy_streaming.rs

@@ -10,7 +10,6 @@ mod bindings {
     use super::Handler;
 
     wit_bindgen::generate!({
-        path: "../wasi-http/wit",
         world: "wasi:http/proxy",
         exports: {
             "wasi:http/incoming-handler": Handler,

crates/test-programs/src/bin/api_reactor.rs

@@ -1,6 +1,5 @@
 wit_bindgen::generate!({
     world: "test-reactor",
-    path: "../wasi/wit",
     exports: {
         world: T,
     }

crates/test-programs/src/lib.rs

@@ -2,4 +2,4 @@ pub mod http;
 pub mod preview1;
 pub mod sockets;
 
-wit_bindgen::generate!("test-command" in "../wasi/wit");
+wit_bindgen::generate!("test-command");

crates/wasi-http/src/lib.rs

@@ -9,7 +9,7 @@ pub mod types_impl;
 
 pub mod bindings {
     wasmtime::component::bindgen!({
-        path: "wit",
+        path: "[email protected]",
         interfaces: "
             import wasi:http/[email protected];
             import wasi:http/[email protected];

crates/wasi-http/src/proxy.rs

@@ -2,6 +2,7 @@ use crate::{bindings, WasiHttpView};
 use wasmtime_wasi::preview2;
 
 wasmtime::component::bindgen!({
+    path: "[email protected]",
     world: "wasi:http/proxy",
     tracing: true,
     async: true,
@@ -54,6 +55,7 @@ pub mod sync {
     use wasmtime_wasi::preview2;
 
     wasmtime::component::bindgen!({
+        path: "[email protected]",
         world: "wasi:http/proxy",
         tracing: true,
         async: false,