From 0abd7085908d17a4e470868e36dc22d0a13933c1 Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Thu, 9 Nov 2023 10:48:05 -0800 Subject: [PATCH] Remove no-longer-necessary reactor world The `wasi:cli` WIT package now has a `reactor` world so the adapter can use that instead of defining its own. --- crates/wasi-http/wit/main.wit | 33 ------------------- crates/wasi-http/wit/test.wit | 2 ++ .../src/lib.rs | 2 +- crates/wasi/wit/main.wit | 33 ------------------- crates/wasi/wit/test.wit | 2 ++ 5 files changed, 5 insertions(+), 67 deletions(-) delete mode 100644 crates/wasi-http/wit/main.wit delete mode 100644 crates/wasi/wit/main.wit diff --git a/crates/wasi-http/wit/main.wit b/crates/wasi-http/wit/main.wit deleted file mode 100644 index 90aa28ad3c42..000000000000 --- a/crates/wasi-http/wit/main.wit +++ /dev/null @@ -1,33 +0,0 @@ -package wasmtime:wasi; - -// All of the same imports available in the wasi:cli/command world, but no -// export required: -world preview1-adapter-reactor { - import wasi:clocks/wall-clock@0.2.0-rc-2023-11-05; - import wasi:clocks/monotonic-clock@0.2.0-rc-2023-11-05; - import wasi:clocks/timezone@0.2.0-rc-2023-11-05; - import wasi:filesystem/types@0.2.0-rc-2023-11-05; - import wasi:filesystem/preopens@0.2.0-rc-2023-11-05; - import wasi:sockets/instance-network@0.2.0-rc-2023-11-05; - import wasi:sockets/ip-name-lookup@0.2.0-rc-2023-11-05; - import wasi:sockets/network@0.2.0-rc-2023-11-05; - import wasi:sockets/tcp-create-socket@0.2.0-rc-2023-11-05; - import wasi:sockets/tcp@0.2.0-rc-2023-11-05; - import wasi:sockets/udp-create-socket@0.2.0-rc-2023-11-05; - import wasi:sockets/udp@0.2.0-rc-2023-11-05; - import wasi:random/random@0.2.0-rc-2023-11-05; - import wasi:random/insecure@0.2.0-rc-2023-11-05; - import wasi:random/insecure-seed@0.2.0-rc-2023-11-05; - import wasi:io/poll@0.2.0-rc-2023-11-05; - import wasi:io/streams@0.2.0-rc-2023-11-05; - import wasi:cli/environment@0.2.0-rc-2023-11-05; - import wasi:cli/exit@0.2.0-rc-2023-11-05; - import wasi:cli/stdin@0.2.0-rc-2023-11-05; - import wasi:cli/stdout@0.2.0-rc-2023-11-05; - import wasi:cli/stderr@0.2.0-rc-2023-11-05; - import wasi:cli/terminal-input@0.2.0-rc-2023-11-05; - import wasi:cli/terminal-output@0.2.0-rc-2023-11-05; - import wasi:cli/terminal-stdin@0.2.0-rc-2023-11-05; - import wasi:cli/terminal-stdout@0.2.0-rc-2023-11-05; - import wasi:cli/terminal-stderr@0.2.0-rc-2023-11-05; -} diff --git a/crates/wasi-http/wit/test.wit b/crates/wasi-http/wit/test.wit index 5e7557ed6d30..fc31f6ef3559 100644 --- a/crates/wasi-http/wit/test.wit +++ b/crates/wasi-http/wit/test.wit @@ -1,3 +1,5 @@ +package wasmtime:wasi; + // only used as part of `test-programs` world test-reactor { include wasi:cli/reactor@0.2.0-rc-2023-11-05; diff --git a/crates/wasi-preview1-component-adapter/src/lib.rs b/crates/wasi-preview1-component-adapter/src/lib.rs index e9f5c6f0f5fe..a7eb62bdc1fd 100644 --- a/crates/wasi-preview1-component-adapter/src/lib.rs +++ b/crates/wasi-preview1-component-adapter/src/lib.rs @@ -45,7 +45,7 @@ pub mod bindings { #[cfg(feature = "reactor")] wit_bindgen::generate!({ path: "../wasi/wit", - world: "wasmtime:wasi/preview1-adapter-reactor", + world: "wasi:cli/reactor", std_feature, raw_strings, // Automatically generated bindings for these functions will allocate diff --git a/crates/wasi/wit/main.wit b/crates/wasi/wit/main.wit deleted file mode 100644 index 90aa28ad3c42..000000000000 --- a/crates/wasi/wit/main.wit +++ /dev/null @@ -1,33 +0,0 @@ -package wasmtime:wasi; - -// All of the same imports available in the wasi:cli/command world, but no -// export required: -world preview1-adapter-reactor { - import wasi:clocks/wall-clock@0.2.0-rc-2023-11-05; - import wasi:clocks/monotonic-clock@0.2.0-rc-2023-11-05; - import wasi:clocks/timezone@0.2.0-rc-2023-11-05; - import wasi:filesystem/types@0.2.0-rc-2023-11-05; - import wasi:filesystem/preopens@0.2.0-rc-2023-11-05; - import wasi:sockets/instance-network@0.2.0-rc-2023-11-05; - import wasi:sockets/ip-name-lookup@0.2.0-rc-2023-11-05; - import wasi:sockets/network@0.2.0-rc-2023-11-05; - import wasi:sockets/tcp-create-socket@0.2.0-rc-2023-11-05; - import wasi:sockets/tcp@0.2.0-rc-2023-11-05; - import wasi:sockets/udp-create-socket@0.2.0-rc-2023-11-05; - import wasi:sockets/udp@0.2.0-rc-2023-11-05; - import wasi:random/random@0.2.0-rc-2023-11-05; - import wasi:random/insecure@0.2.0-rc-2023-11-05; - import wasi:random/insecure-seed@0.2.0-rc-2023-11-05; - import wasi:io/poll@0.2.0-rc-2023-11-05; - import wasi:io/streams@0.2.0-rc-2023-11-05; - import wasi:cli/environment@0.2.0-rc-2023-11-05; - import wasi:cli/exit@0.2.0-rc-2023-11-05; - import wasi:cli/stdin@0.2.0-rc-2023-11-05; - import wasi:cli/stdout@0.2.0-rc-2023-11-05; - import wasi:cli/stderr@0.2.0-rc-2023-11-05; - import wasi:cli/terminal-input@0.2.0-rc-2023-11-05; - import wasi:cli/terminal-output@0.2.0-rc-2023-11-05; - import wasi:cli/terminal-stdin@0.2.0-rc-2023-11-05; - import wasi:cli/terminal-stdout@0.2.0-rc-2023-11-05; - import wasi:cli/terminal-stderr@0.2.0-rc-2023-11-05; -} diff --git a/crates/wasi/wit/test.wit b/crates/wasi/wit/test.wit index 5e7557ed6d30..fc31f6ef3559 100644 --- a/crates/wasi/wit/test.wit +++ b/crates/wasi/wit/test.wit @@ -1,3 +1,5 @@ +package wasmtime:wasi; + // only used as part of `test-programs` world test-reactor { include wasi:cli/reactor@0.2.0-rc-2023-11-05;