test-programs: reorganize wasi content generated by wit and remove un…

…necessary deps

ci/vendor-wit.sh

@@ -43,7 +43,6 @@ make_vendor "wasi" "
   [email protected]
   [email protected]
   [email protected]
-  [email protected]
 "
 
 make_vendor "wasi-http" "

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

@@ -1,7 +1,7 @@
-use test_programs::keyvalue::wasi::keyvalue;
 use test_programs::proxy;
-use test_programs::wasi::http::types::{
-    Fields, IncomingRequest, OutgoingBody, OutgoingResponse, ResponseOutparam,
+use test_programs::wasi::{
+    http::types::{Fields, IncomingRequest, OutgoingBody, OutgoingResponse, ResponseOutparam},
+    keyvalue,
 };
 
 struct T;

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

@@ -1,7 +1,7 @@
-use test_programs::config::wasi::config::runtime;
 use test_programs::proxy;
-use test_programs::wasi::http::types::{
-    Fields, IncomingRequest, OutgoingBody, OutgoingResponse, ResponseOutparam,
+use test_programs::wasi::{
+    config::runtime,
+    http::types::{Fields, IncomingRequest, OutgoingBody, OutgoingResponse, ResponseOutparam},
 };
 
 struct T;

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

@@ -1,4 +1,4 @@
-use test_programs::keyvalue::wasi::keyvalue::{atomics, batch, store};
+use test_programs::wasi::keyvalue::{atomics, batch, store};
 
 fn main() {
     let bucket = store::open("").unwrap();

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

@@ -1,4 +1,4 @@
-use test_programs::config::wasi::config::runtime;
+use test_programs::wasi::config::runtime;
 
 fn main() {
     let v = runtime::get("hello").unwrap().unwrap();

crates/test-programs/src/lib.rs

@@ -4,8 +4,23 @@ pub mod preview1;
 pub mod sockets;
 
 wit_bindgen::generate!({
-    world: "test-command",
-    path: "../wasi/wit",
+    inline: "
+        package wasmtime:test;
+
+        world test {
+            include wasi:cli/[email protected];
+            include wasi:config/[email protected];
+            include wasi:keyvalue/[email protected];
+            import wasi:http/[email protected];
+            import wasi:http/[email protected];
+        }
+    ",
+    path: [
+        "../wasi-http/wit",
+        "../wasi-runtime-config/wit",
+        "../wasi-keyvalue/wit",
+    ],
+    world: "wasmtime:test/test",
     generate_all,
 });
 
@@ -30,18 +45,3 @@ pub mod proxy {
         },
     });
 }
-
-pub mod config {
-    wit_bindgen::generate!({
-        path: "../wasi-runtime-config/wit",
-        world: "wasi:config/imports",
-    });
-}
-
-pub mod keyvalue {
-    wit_bindgen::generate!({
-        path: "../wasi-keyvalue/wit",
-        world: "wasi:keyvalue/imports",
-        type_section_suffix: "keyvalue",
-    });
-}

crates/wasi-http/wit/world.wit

@@ -0,0 +1,6 @@
+// We actually don't use this; it's just to let bindgen! find the corresponding world in wit/deps.
+package wasmtime:wasi-http;
+
+world bindings {
+  include wasi:http/proxy@0.2.1;
+}

crates/wasi-keyvalue/wit/world.wit

@@ -1,5 +1,5 @@
 // We actually don't use this; it's just to let bindgen! find the corresponding world in wit/deps.
-package wasmtime:wasi;
+package wasmtime:wasi-keyvalue;
 
 world bindings {
   include wasi:keyvalue/imports@0.2.0-draft;

crates/wasi-preview1-component-adapter/src/lib.rs

@@ -97,6 +97,7 @@ pub mod bindings {
                 import wasi:cli/[email protected];
             }
         "#,
+        world: "wasmtime:adapter/adapter",
         std_feature,
         raw_strings,
         runtime_path: "crate::bindings::wit_bindgen_rt_shim",

crates/wasi-runtime-config/wit/world.wit

@@ -1,5 +1,5 @@
 // We actually don't use this; it's just to let bindgen! find the corresponding world in wit/deps.
-package wasmtime:wasi;
+package wasmtime:wasi-config;
 
 world bindings {
   include wasi:config/imports@0.2.0-draft;