github
/
cranelift
mirror of https://github.com/bytecodealliance/wasmtime.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Remove no-longer-necessary reactor world (#7516) 

The `wasi:cli` WIT package now has a `reactor` world so the adapter can
use that instead of defining its own.
pull/7523/head
Alex Crichton 1 year ago
committed by GitHub
parent
f1cb847c0d
commit
32d2b04627
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 5 additions and 67 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 33
      crates/wasi-http/wit/main.wit
  2. 2
      crates/wasi-http/wit/test.wit
  3. 2
      crates/wasi-preview1-component-adapter/src/lib.rs
  4. 33
      crates/wasi/wit/main.wit
  5. 2
      crates/wasi/wit/test.wit

33
crates/wasi-http/wit/main.wit
View File

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

2
crates/wasi-http/wit/test.wit
View File

@ -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;

2
crates/wasi-preview1-component-adapter/src/lib.rs
View File

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

33
crates/wasi/wit/main.wit
View File

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

2
crates/wasi/wit/test.wit
View File

@ -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;

Write Preview
Loading…
Cancel
Save