From 11b600192dd5e259cbd91eadea2c97736676044e Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Thu, 19 Oct 2023 18:15:59 -0500 Subject: [PATCH] Update WASI versions to `0.2.0-rc-2023-11-05` (#7302) * Update WASI versions to `0.2.0-rc-2023-11-05` This commit updates the version numbers on `main` to no longer clash with the 14.0.0 release after #7299. The version number is chosen as the branch point for the 15.0.0 release of Wasmtime, at which point we'll update the versions again. * Update another version --- crates/wasi-http/src/lib.rs | 6 +-- crates/wasi-http/wit/command-extended.wit | 4 +- crates/wasi-http/wit/deps/cli/command.wit | 2 +- crates/wasi-http/wit/deps/cli/reactor.wit | 36 ++++++------- crates/wasi-http/wit/deps/cli/stdio.wit | 6 +-- .../wit/deps/clocks/monotonic-clock.wit | 2 +- crates/wasi-http/wit/deps/clocks/world.wit | 2 +- .../wasi-http/wit/deps/filesystem/types.wit | 4 +- .../wasi-http/wit/deps/filesystem/world.wit | 2 +- crates/wasi-http/wit/deps/http/proxy.wit | 16 +++--- crates/wasi-http/wit/deps/http/types.wit | 4 +- crates/wasi-http/wit/deps/io/poll.wit | 2 +- crates/wasi-http/wit/deps/io/streams.wit | 2 +- crates/wasi-http/wit/deps/io/world.wit | 2 +- crates/wasi-http/wit/deps/random/world.wit | 2 +- .../wit/deps/sockets/ip-name-lookup.wit | 2 +- crates/wasi-http/wit/deps/sockets/tcp.wit | 4 +- crates/wasi-http/wit/deps/sockets/udp.wit | 2 +- crates/wasi-http/wit/deps/sockets/world.wit | 2 +- crates/wasi-http/wit/main.wit | 54 +++++++++---------- crates/wasi-http/wit/test.wit | 12 ++--- .../src/descriptors.rs | 2 +- .../src/lib.rs | 8 +-- crates/wasi/src/preview2/mod.rs | 6 +-- crates/wasi/wit/command-extended.wit | 4 +- crates/wasi/wit/deps/cli/command.wit | 2 +- crates/wasi/wit/deps/cli/reactor.wit | 36 ++++++------- crates/wasi/wit/deps/cli/stdio.wit | 6 +-- .../wasi/wit/deps/clocks/monotonic-clock.wit | 2 +- crates/wasi/wit/deps/clocks/world.wit | 2 +- crates/wasi/wit/deps/filesystem/types.wit | 4 +- crates/wasi/wit/deps/filesystem/world.wit | 2 +- crates/wasi/wit/deps/http/proxy.wit | 16 +++--- crates/wasi/wit/deps/http/types.wit | 4 +- crates/wasi/wit/deps/io/poll.wit | 2 +- crates/wasi/wit/deps/io/streams.wit | 2 +- crates/wasi/wit/deps/io/world.wit | 2 +- crates/wasi/wit/deps/random/world.wit | 2 +- .../wasi/wit/deps/sockets/ip-name-lookup.wit | 2 +- crates/wasi/wit/deps/sockets/tcp.wit | 4 +- crates/wasi/wit/deps/sockets/udp.wit | 2 +- crates/wasi/wit/deps/sockets/world.wit | 2 +- crates/wasi/wit/main.wit | 54 +++++++++---------- crates/wasi/wit/test.wit | 12 ++--- tests/all/cli_tests/component-basic.wat | 2 +- 45 files changed, 174 insertions(+), 174 deletions(-) diff --git a/crates/wasi-http/src/lib.rs b/crates/wasi-http/src/lib.rs index cb0e45a42410..2a194684ffed 100644 --- a/crates/wasi-http/src/lib.rs +++ b/crates/wasi-http/src/lib.rs @@ -10,9 +10,9 @@ pub mod bindings { wasmtime::component::bindgen!({ path: "wit", interfaces: " - import wasi:http/incoming-handler@0.2.0-rc-2023-10-18; - import wasi:http/outgoing-handler@0.2.0-rc-2023-10-18; - import wasi:http/types@0.2.0-rc-2023-10-18; + import wasi:http/incoming-handler@0.2.0-rc-2023-11-05; + import wasi:http/outgoing-handler@0.2.0-rc-2023-11-05; + import wasi:http/types@0.2.0-rc-2023-11-05; ", tracing: true, async: false, diff --git a/crates/wasi-http/wit/command-extended.wit b/crates/wasi-http/wit/command-extended.wit index 310b736ba769..00cee3aafb39 100644 --- a/crates/wasi-http/wit/command-extended.wit +++ b/crates/wasi-http/wit/command-extended.wit @@ -1,6 +1,6 @@ // All of the same imports and exports available in the wasi:cli/command world // with addition of HTTP proxy related imports: world command-extended { - include wasi:cli/command@0.2.0-rc-2023-10-18; - import wasi:http/outgoing-handler@0.2.0-rc-2023-10-18; + include wasi:cli/command@0.2.0-rc-2023-11-05; + import wasi:http/outgoing-handler@0.2.0-rc-2023-11-05; } diff --git a/crates/wasi-http/wit/deps/cli/command.wit b/crates/wasi-http/wit/deps/cli/command.wit index d7ea2d91f033..07925c0377b3 100644 --- a/crates/wasi-http/wit/deps/cli/command.wit +++ b/crates/wasi-http/wit/deps/cli/command.wit @@ -1,4 +1,4 @@ -package wasi:cli@0.2.0-rc-2023-10-18; +package wasi:cli@0.2.0-rc-2023-11-05; world command { include reactor; diff --git a/crates/wasi-http/wit/deps/cli/reactor.wit b/crates/wasi-http/wit/deps/cli/reactor.wit index 904b99467977..4b829834c25b 100644 --- a/crates/wasi-http/wit/deps/cli/reactor.wit +++ b/crates/wasi-http/wit/deps/cli/reactor.wit @@ -1,23 +1,23 @@ -package wasi:cli@0.2.0-rc-2023-10-18; +package wasi:cli@0.2.0-rc-2023-11-05; world reactor { - import wasi:clocks/wall-clock@0.2.0-rc-2023-10-18; - import wasi:clocks/monotonic-clock@0.2.0-rc-2023-10-18; - import wasi:clocks/timezone@0.2.0-rc-2023-10-18; - import wasi:filesystem/types@0.2.0-rc-2023-10-18; - import wasi:filesystem/preopens@0.2.0-rc-2023-10-18; - import wasi:sockets/instance-network@0.2.0-rc-2023-10-18; - import wasi:sockets/ip-name-lookup@0.2.0-rc-2023-10-18; - import wasi:sockets/network@0.2.0-rc-2023-10-18; - import wasi:sockets/tcp-create-socket@0.2.0-rc-2023-10-18; - import wasi:sockets/tcp@0.2.0-rc-2023-10-18; - import wasi:sockets/udp-create-socket@0.2.0-rc-2023-10-18; - import wasi:sockets/udp@0.2.0-rc-2023-10-18; - import wasi:random/random@0.2.0-rc-2023-10-18; - import wasi:random/insecure@0.2.0-rc-2023-10-18; - import wasi:random/insecure-seed@0.2.0-rc-2023-10-18; - import wasi:io/poll@0.2.0-rc-2023-10-18; - import wasi:io/streams@0.2.0-rc-2023-10-18; + 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 environment; import exit; diff --git a/crates/wasi-http/wit/deps/cli/stdio.wit b/crates/wasi-http/wit/deps/cli/stdio.wit index 513ca92de0df..6058260cf1b6 100644 --- a/crates/wasi-http/wit/deps/cli/stdio.wit +++ b/crates/wasi-http/wit/deps/cli/stdio.wit @@ -1,17 +1,17 @@ interface stdin { - use wasi:io/streams@0.2.0-rc-2023-10-18.{input-stream}; + use wasi:io/streams@0.2.0-rc-2023-11-05.{input-stream}; get-stdin: func() -> input-stream; } interface stdout { - use wasi:io/streams@0.2.0-rc-2023-10-18.{output-stream}; + use wasi:io/streams@0.2.0-rc-2023-11-05.{output-stream}; get-stdout: func() -> output-stream; } interface stderr { - use wasi:io/streams@0.2.0-rc-2023-10-18.{output-stream}; + use wasi:io/streams@0.2.0-rc-2023-11-05.{output-stream}; get-stderr: func() -> output-stream; } diff --git a/crates/wasi-http/wit/deps/clocks/monotonic-clock.wit b/crates/wasi-http/wit/deps/clocks/monotonic-clock.wit index c0ecb529ba4f..a3f7fe25c65b 100644 --- a/crates/wasi-http/wit/deps/clocks/monotonic-clock.wit +++ b/crates/wasi-http/wit/deps/clocks/monotonic-clock.wit @@ -9,7 +9,7 @@ /// /// It is intended for measuring elapsed time. interface monotonic-clock { - use wasi:io/poll@0.2.0-rc-2023-10-18.{pollable}; + use wasi:io/poll@0.2.0-rc-2023-11-05.{pollable}; /// A timestamp in nanoseconds. type instant = u64; diff --git a/crates/wasi-http/wit/deps/clocks/world.wit b/crates/wasi-http/wit/deps/clocks/world.wit index cdfb51d9ad6c..a53d025b85b0 100644 --- a/crates/wasi-http/wit/deps/clocks/world.wit +++ b/crates/wasi-http/wit/deps/clocks/world.wit @@ -1,4 +1,4 @@ -package wasi:clocks@0.2.0-rc-2023-10-18; +package wasi:clocks@0.2.0-rc-2023-11-05; world imports { import monotonic-clock; diff --git a/crates/wasi-http/wit/deps/filesystem/types.wit b/crates/wasi-http/wit/deps/filesystem/types.wit index af3613543efb..81dcde9083f4 100644 --- a/crates/wasi-http/wit/deps/filesystem/types.wit +++ b/crates/wasi-http/wit/deps/filesystem/types.wit @@ -23,8 +23,8 @@ /// /// [WASI filesystem path resolution]: https://github.com/WebAssembly/wasi-filesystem/blob/main/path-resolution.md interface types { - use wasi:io/streams@0.2.0-rc-2023-10-18.{input-stream, output-stream, error}; - use wasi:clocks/wall-clock@0.2.0-rc-2023-10-18.{datetime}; + use wasi:io/streams@0.2.0-rc-2023-11-05.{input-stream, output-stream, error}; + use wasi:clocks/wall-clock@0.2.0-rc-2023-11-05.{datetime}; /// File size or length of a region within a file. type filesize = u64; diff --git a/crates/wasi-http/wit/deps/filesystem/world.wit b/crates/wasi-http/wit/deps/filesystem/world.wit index 3f953f893bf4..a4654e4cc451 100644 --- a/crates/wasi-http/wit/deps/filesystem/world.wit +++ b/crates/wasi-http/wit/deps/filesystem/world.wit @@ -1,4 +1,4 @@ -package wasi:filesystem@0.2.0-rc-2023-10-18; +package wasi:filesystem@0.2.0-rc-2023-11-05; world imports { import types; diff --git a/crates/wasi-http/wit/deps/http/proxy.wit b/crates/wasi-http/wit/deps/http/proxy.wit index dde0659d6054..7d0e84eb2315 100644 --- a/crates/wasi-http/wit/deps/http/proxy.wit +++ b/crates/wasi-http/wit/deps/http/proxy.wit @@ -1,4 +1,4 @@ -package wasi:http@0.2.0-rc-2023-10-18; +package wasi:http@0.2.0-rc-2023-11-05; // The `wasi:http/proxy` world captures a widely-implementable intersection of // hosts that includes HTTP forward and reverse proxies. Components targeting @@ -6,21 +6,21 @@ package wasi:http@0.2.0-rc-2023-10-18; // outgoing HTTP requests. world proxy { // HTTP proxies have access to time and randomness. - import wasi:clocks/wall-clock@0.2.0-rc-2023-10-18; - import wasi:clocks/monotonic-clock@0.2.0-rc-2023-10-18; - import wasi:clocks/timezone@0.2.0-rc-2023-10-18; - import wasi:random/random@0.2.0-rc-2023-10-18; + 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:random/random@0.2.0-rc-2023-11-05; // Proxies have standard output and error streams which are expected to // terminate in a developer-facing console provided by the host. - import wasi:cli/stdout@0.2.0-rc-2023-10-18; - import wasi:cli/stderr@0.2.0-rc-2023-10-18; + import wasi:cli/stdout@0.2.0-rc-2023-11-05; + import wasi:cli/stderr@0.2.0-rc-2023-11-05; // TODO: this is a temporary workaround until component tooling is able to // gracefully handle the absence of stdin. Hosts must return an eof stream // for this import, which is what wasi-libc + tooling will do automatically // when this import is properly removed. - import wasi:cli/stdin@0.2.0-rc-2023-10-18; + import wasi:cli/stdin@0.2.0-rc-2023-11-05; // This is the default handler to use when user code simply wants to make an // HTTP request (e.g., via `fetch()`). diff --git a/crates/wasi-http/wit/deps/http/types.wit b/crates/wasi-http/wit/deps/http/types.wit index 2cd2fe2190db..bca0d6528243 100644 --- a/crates/wasi-http/wit/deps/http/types.wit +++ b/crates/wasi-http/wit/deps/http/types.wit @@ -2,8 +2,8 @@ // define the HTTP resource types and operations used by the component's // imported and exported interfaces. interface types { - use wasi:io/streams@0.2.0-rc-2023-10-18.{input-stream, output-stream}; - use wasi:io/poll@0.2.0-rc-2023-10-18.{pollable}; + use wasi:io/streams@0.2.0-rc-2023-11-05.{input-stream, output-stream}; + use wasi:io/poll@0.2.0-rc-2023-11-05.{pollable}; // This type corresponds to HTTP standard Methods. variant method { diff --git a/crates/wasi-http/wit/deps/io/poll.wit b/crates/wasi-http/wit/deps/io/poll.wit index 047389d214c7..52a4957dc496 100644 --- a/crates/wasi-http/wit/deps/io/poll.wit +++ b/crates/wasi-http/wit/deps/io/poll.wit @@ -1,4 +1,4 @@ -package wasi:io@0.2.0-rc-2023-10-18; +package wasi:io@0.2.0-rc-2023-11-05; /// A poll API intended to let users wait for I/O events on multiple handles /// at once. diff --git a/crates/wasi-http/wit/deps/io/streams.wit b/crates/wasi-http/wit/deps/io/streams.wit index 968795b2d11d..9442f60c0e16 100644 --- a/crates/wasi-http/wit/deps/io/streams.wit +++ b/crates/wasi-http/wit/deps/io/streams.wit @@ -1,4 +1,4 @@ -package wasi:io@0.2.0-rc-2023-10-18; +package wasi:io@0.2.0-rc-2023-11-05; /// WASI I/O is an I/O abstraction API which is currently focused on providing /// stream types. diff --git a/crates/wasi-http/wit/deps/io/world.wit b/crates/wasi-http/wit/deps/io/world.wit index 3627c9d687b3..4b9b21da6833 100644 --- a/crates/wasi-http/wit/deps/io/world.wit +++ b/crates/wasi-http/wit/deps/io/world.wit @@ -1,4 +1,4 @@ -package wasi:io@0.2.0-rc-2023-10-18; +package wasi:io@0.2.0-rc-2023-11-05; world imports { import streams; diff --git a/crates/wasi-http/wit/deps/random/world.wit b/crates/wasi-http/wit/deps/random/world.wit index dcbff9384927..9128dd68f098 100644 --- a/crates/wasi-http/wit/deps/random/world.wit +++ b/crates/wasi-http/wit/deps/random/world.wit @@ -1,4 +1,4 @@ -package wasi:random@0.2.0-rc-2023-10-18; +package wasi:random@0.2.0-rc-2023-11-05; world imports { import random; diff --git a/crates/wasi-http/wit/deps/sockets/ip-name-lookup.wit b/crates/wasi-http/wit/deps/sockets/ip-name-lookup.wit index 4f94329917c2..5ffe2a217c61 100644 --- a/crates/wasi-http/wit/deps/sockets/ip-name-lookup.wit +++ b/crates/wasi-http/wit/deps/sockets/ip-name-lookup.wit @@ -1,6 +1,6 @@ interface ip-name-lookup { - use wasi:io/poll@0.2.0-rc-2023-10-18.{pollable}; + use wasi:io/poll@0.2.0-rc-2023-11-05.{pollable}; use network.{network, error-code, ip-address, ip-address-family}; diff --git a/crates/wasi-http/wit/deps/sockets/tcp.wit b/crates/wasi-http/wit/deps/sockets/tcp.wit index c316a724542e..b9073b77515d 100644 --- a/crates/wasi-http/wit/deps/sockets/tcp.wit +++ b/crates/wasi-http/wit/deps/sockets/tcp.wit @@ -1,7 +1,7 @@ interface tcp { - use wasi:io/streams@0.2.0-rc-2023-10-18.{input-stream, output-stream}; - use wasi:io/poll@0.2.0-rc-2023-10-18.{pollable}; + use wasi:io/streams@0.2.0-rc-2023-11-05.{input-stream, output-stream}; + use wasi:io/poll@0.2.0-rc-2023-11-05.{pollable}; use network.{network, error-code, ip-socket-address, ip-address-family}; enum shutdown-type { diff --git a/crates/wasi-http/wit/deps/sockets/udp.wit b/crates/wasi-http/wit/deps/sockets/udp.wit index a86226f01517..8641cc2c5dbd 100644 --- a/crates/wasi-http/wit/deps/sockets/udp.wit +++ b/crates/wasi-http/wit/deps/sockets/udp.wit @@ -1,6 +1,6 @@ interface udp { - use wasi:io/poll@0.2.0-rc-2023-10-18.{pollable}; + use wasi:io/poll@0.2.0-rc-2023-11-05.{pollable}; use network.{network, error-code, ip-socket-address, ip-address-family}; diff --git a/crates/wasi-http/wit/deps/sockets/world.wit b/crates/wasi-http/wit/deps/sockets/world.wit index d16530c3894d..979703869c06 100644 --- a/crates/wasi-http/wit/deps/sockets/world.wit +++ b/crates/wasi-http/wit/deps/sockets/world.wit @@ -1,4 +1,4 @@ -package wasi:sockets@0.2.0-rc-2023-10-18; +package wasi:sockets@0.2.0-rc-2023-11-05; world imports { import instance-network; diff --git a/crates/wasi-http/wit/main.wit b/crates/wasi-http/wit/main.wit index f3a4e60cc604..90aa28ad3c42 100644 --- a/crates/wasi-http/wit/main.wit +++ b/crates/wasi-http/wit/main.wit @@ -3,31 +3,31 @@ 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-10-18; - import wasi:clocks/monotonic-clock@0.2.0-rc-2023-10-18; - import wasi:clocks/timezone@0.2.0-rc-2023-10-18; - import wasi:filesystem/types@0.2.0-rc-2023-10-18; - import wasi:filesystem/preopens@0.2.0-rc-2023-10-18; - import wasi:sockets/instance-network@0.2.0-rc-2023-10-18; - import wasi:sockets/ip-name-lookup@0.2.0-rc-2023-10-18; - import wasi:sockets/network@0.2.0-rc-2023-10-18; - import wasi:sockets/tcp-create-socket@0.2.0-rc-2023-10-18; - import wasi:sockets/tcp@0.2.0-rc-2023-10-18; - import wasi:sockets/udp-create-socket@0.2.0-rc-2023-10-18; - import wasi:sockets/udp@0.2.0-rc-2023-10-18; - import wasi:random/random@0.2.0-rc-2023-10-18; - import wasi:random/insecure@0.2.0-rc-2023-10-18; - import wasi:random/insecure-seed@0.2.0-rc-2023-10-18; - import wasi:io/poll@0.2.0-rc-2023-10-18; - import wasi:io/streams@0.2.0-rc-2023-10-18; - import wasi:cli/environment@0.2.0-rc-2023-10-18; - import wasi:cli/exit@0.2.0-rc-2023-10-18; - import wasi:cli/stdin@0.2.0-rc-2023-10-18; - import wasi:cli/stdout@0.2.0-rc-2023-10-18; - import wasi:cli/stderr@0.2.0-rc-2023-10-18; - import wasi:cli/terminal-input@0.2.0-rc-2023-10-18; - import wasi:cli/terminal-output@0.2.0-rc-2023-10-18; - import wasi:cli/terminal-stdin@0.2.0-rc-2023-10-18; - import wasi:cli/terminal-stdout@0.2.0-rc-2023-10-18; - import wasi:cli/terminal-stderr@0.2.0-rc-2023-10-18; + 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 472aeccd3e0f..5e7557ed6d30 100644 --- a/crates/wasi-http/wit/test.wit +++ b/crates/wasi-http/wit/test.wit @@ -1,20 +1,20 @@ // only used as part of `test-programs` world test-reactor { - include wasi:cli/reactor@0.2.0-rc-2023-10-18; + include wasi:cli/reactor@0.2.0-rc-2023-11-05; export add-strings: func(s: list) -> u32; export get-strings: func() -> list; - use wasi:io/streams@0.2.0-rc-2023-10-18.{output-stream}; + use wasi:io/streams@0.2.0-rc-2023-11-05.{output-stream}; export write-strings-to: func(o: output-stream) -> result; - use wasi:filesystem/types@0.2.0-rc-2023-10-18.{descriptor-stat}; + use wasi:filesystem/types@0.2.0-rc-2023-11-05.{descriptor-stat}; export pass-an-imported-record: func(d: descriptor-stat) -> string; } world test-command { - include wasi:cli/reactor@0.2.0-rc-2023-10-18; - import wasi:http/types@0.2.0-rc-2023-10-18; - import wasi:http/outgoing-handler@0.2.0-rc-2023-10-18; + include wasi:cli/reactor@0.2.0-rc-2023-11-05; + import wasi:http/types@0.2.0-rc-2023-11-05; + import wasi:http/outgoing-handler@0.2.0-rc-2023-11-05; } diff --git a/crates/wasi-preview1-component-adapter/src/descriptors.rs b/crates/wasi-preview1-component-adapter/src/descriptors.rs index 1c0ba4609d31..1eced19abb04 100644 --- a/crates/wasi-preview1-component-adapter/src/descriptors.rs +++ b/crates/wasi-preview1-component-adapter/src/descriptors.rs @@ -181,7 +181,7 @@ impl Descriptors { })) .trapping_unwrap(); - #[link(wasm_import_module = "wasi:filesystem/preopens@0.2.0-rc-2023-10-18")] + #[link(wasm_import_module = "wasi:filesystem/preopens@0.2.0-rc-2023-11-05")] #[allow(improper_ctypes)] // FIXME(bytecodealliance/wit-bindgen#684) extern "C" { #[link_name = "get-directories"] diff --git a/crates/wasi-preview1-component-adapter/src/lib.rs b/crates/wasi-preview1-component-adapter/src/lib.rs index ff09003d1465..08978baa51a3 100644 --- a/crates/wasi-preview1-component-adapter/src/lib.rs +++ b/crates/wasi-preview1-component-adapter/src/lib.rs @@ -58,7 +58,7 @@ pub mod bindings { }); } -#[export_name = "wasi:cli/run@0.2.0-rc-2023-10-18#run"] +#[export_name = "wasi:cli/run@0.2.0-rc-2023-11-05#run"] #[cfg(feature = "command")] pub unsafe extern "C" fn run() -> u32 { #[link(wasm_import_module = "__main_module__")] @@ -1774,7 +1774,7 @@ pub unsafe extern "C" fn poll_oneoff( }); } - #[link(wasm_import_module = "wasi:io/poll@0.2.0-rc-2023-10-18")] + #[link(wasm_import_module = "wasi:io/poll@0.2.0-rc-2023-11-05")] #[allow(improper_ctypes)] // FIXME(bytecodealliance/wit-bindgen#684) extern "C" { #[link_name = "poll-list"] @@ -2495,7 +2495,7 @@ impl State { fn get_environment(&self) -> &[StrTuple] { if self.env_vars.get().is_none() { - #[link(wasm_import_module = "wasi:cli/environment@0.2.0-rc-2023-10-18")] + #[link(wasm_import_module = "wasi:cli/environment@0.2.0-rc-2023-11-05")] extern "C" { #[link_name = "get-environment"] fn get_environment_import(rval: *mut StrTupleList); @@ -2519,7 +2519,7 @@ impl State { fn get_args(&self) -> &[WasmStr] { if self.args.get().is_none() { - #[link(wasm_import_module = "wasi:cli/environment@0.2.0-rc-2023-10-18")] + #[link(wasm_import_module = "wasi:cli/environment@0.2.0-rc-2023-11-05")] extern "C" { #[link_name = "get-arguments"] fn get_args_import(rval: *mut WasmStrList); diff --git a/crates/wasi/src/preview2/mod.rs b/crates/wasi/src/preview2/mod.rs index 6208cb1126ec..abdfe4df5ca3 100644 --- a/crates/wasi/src/preview2/mod.rs +++ b/crates/wasi/src/preview2/mod.rs @@ -68,9 +68,9 @@ pub mod bindings { wasmtime::component::bindgen!({ path: "wit", interfaces: " - import wasi:io/poll@0.2.0-rc-2023-10-18; - import wasi:io/streams@0.2.0-rc-2023-10-18; - import wasi:filesystem/types@0.2.0-rc-2023-10-18; + import wasi:io/poll@0.2.0-rc-2023-11-05; + import wasi:io/streams@0.2.0-rc-2023-11-05; + import wasi:filesystem/types@0.2.0-rc-2023-11-05; ", tracing: true, trappable_error_type: { diff --git a/crates/wasi/wit/command-extended.wit b/crates/wasi/wit/command-extended.wit index 310b736ba769..00cee3aafb39 100644 --- a/crates/wasi/wit/command-extended.wit +++ b/crates/wasi/wit/command-extended.wit @@ -1,6 +1,6 @@ // All of the same imports and exports available in the wasi:cli/command world // with addition of HTTP proxy related imports: world command-extended { - include wasi:cli/command@0.2.0-rc-2023-10-18; - import wasi:http/outgoing-handler@0.2.0-rc-2023-10-18; + include wasi:cli/command@0.2.0-rc-2023-11-05; + import wasi:http/outgoing-handler@0.2.0-rc-2023-11-05; } diff --git a/crates/wasi/wit/deps/cli/command.wit b/crates/wasi/wit/deps/cli/command.wit index d7ea2d91f033..07925c0377b3 100644 --- a/crates/wasi/wit/deps/cli/command.wit +++ b/crates/wasi/wit/deps/cli/command.wit @@ -1,4 +1,4 @@ -package wasi:cli@0.2.0-rc-2023-10-18; +package wasi:cli@0.2.0-rc-2023-11-05; world command { include reactor; diff --git a/crates/wasi/wit/deps/cli/reactor.wit b/crates/wasi/wit/deps/cli/reactor.wit index 904b99467977..4b829834c25b 100644 --- a/crates/wasi/wit/deps/cli/reactor.wit +++ b/crates/wasi/wit/deps/cli/reactor.wit @@ -1,23 +1,23 @@ -package wasi:cli@0.2.0-rc-2023-10-18; +package wasi:cli@0.2.0-rc-2023-11-05; world reactor { - import wasi:clocks/wall-clock@0.2.0-rc-2023-10-18; - import wasi:clocks/monotonic-clock@0.2.0-rc-2023-10-18; - import wasi:clocks/timezone@0.2.0-rc-2023-10-18; - import wasi:filesystem/types@0.2.0-rc-2023-10-18; - import wasi:filesystem/preopens@0.2.0-rc-2023-10-18; - import wasi:sockets/instance-network@0.2.0-rc-2023-10-18; - import wasi:sockets/ip-name-lookup@0.2.0-rc-2023-10-18; - import wasi:sockets/network@0.2.0-rc-2023-10-18; - import wasi:sockets/tcp-create-socket@0.2.0-rc-2023-10-18; - import wasi:sockets/tcp@0.2.0-rc-2023-10-18; - import wasi:sockets/udp-create-socket@0.2.0-rc-2023-10-18; - import wasi:sockets/udp@0.2.0-rc-2023-10-18; - import wasi:random/random@0.2.0-rc-2023-10-18; - import wasi:random/insecure@0.2.0-rc-2023-10-18; - import wasi:random/insecure-seed@0.2.0-rc-2023-10-18; - import wasi:io/poll@0.2.0-rc-2023-10-18; - import wasi:io/streams@0.2.0-rc-2023-10-18; + 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 environment; import exit; diff --git a/crates/wasi/wit/deps/cli/stdio.wit b/crates/wasi/wit/deps/cli/stdio.wit index 513ca92de0df..6058260cf1b6 100644 --- a/crates/wasi/wit/deps/cli/stdio.wit +++ b/crates/wasi/wit/deps/cli/stdio.wit @@ -1,17 +1,17 @@ interface stdin { - use wasi:io/streams@0.2.0-rc-2023-10-18.{input-stream}; + use wasi:io/streams@0.2.0-rc-2023-11-05.{input-stream}; get-stdin: func() -> input-stream; } interface stdout { - use wasi:io/streams@0.2.0-rc-2023-10-18.{output-stream}; + use wasi:io/streams@0.2.0-rc-2023-11-05.{output-stream}; get-stdout: func() -> output-stream; } interface stderr { - use wasi:io/streams@0.2.0-rc-2023-10-18.{output-stream}; + use wasi:io/streams@0.2.0-rc-2023-11-05.{output-stream}; get-stderr: func() -> output-stream; } diff --git a/crates/wasi/wit/deps/clocks/monotonic-clock.wit b/crates/wasi/wit/deps/clocks/monotonic-clock.wit index c0ecb529ba4f..a3f7fe25c65b 100644 --- a/crates/wasi/wit/deps/clocks/monotonic-clock.wit +++ b/crates/wasi/wit/deps/clocks/monotonic-clock.wit @@ -9,7 +9,7 @@ /// /// It is intended for measuring elapsed time. interface monotonic-clock { - use wasi:io/poll@0.2.0-rc-2023-10-18.{pollable}; + use wasi:io/poll@0.2.0-rc-2023-11-05.{pollable}; /// A timestamp in nanoseconds. type instant = u64; diff --git a/crates/wasi/wit/deps/clocks/world.wit b/crates/wasi/wit/deps/clocks/world.wit index cdfb51d9ad6c..a53d025b85b0 100644 --- a/crates/wasi/wit/deps/clocks/world.wit +++ b/crates/wasi/wit/deps/clocks/world.wit @@ -1,4 +1,4 @@ -package wasi:clocks@0.2.0-rc-2023-10-18; +package wasi:clocks@0.2.0-rc-2023-11-05; world imports { import monotonic-clock; diff --git a/crates/wasi/wit/deps/filesystem/types.wit b/crates/wasi/wit/deps/filesystem/types.wit index af3613543efb..81dcde9083f4 100644 --- a/crates/wasi/wit/deps/filesystem/types.wit +++ b/crates/wasi/wit/deps/filesystem/types.wit @@ -23,8 +23,8 @@ /// /// [WASI filesystem path resolution]: https://github.com/WebAssembly/wasi-filesystem/blob/main/path-resolution.md interface types { - use wasi:io/streams@0.2.0-rc-2023-10-18.{input-stream, output-stream, error}; - use wasi:clocks/wall-clock@0.2.0-rc-2023-10-18.{datetime}; + use wasi:io/streams@0.2.0-rc-2023-11-05.{input-stream, output-stream, error}; + use wasi:clocks/wall-clock@0.2.0-rc-2023-11-05.{datetime}; /// File size or length of a region within a file. type filesize = u64; diff --git a/crates/wasi/wit/deps/filesystem/world.wit b/crates/wasi/wit/deps/filesystem/world.wit index 3f953f893bf4..a4654e4cc451 100644 --- a/crates/wasi/wit/deps/filesystem/world.wit +++ b/crates/wasi/wit/deps/filesystem/world.wit @@ -1,4 +1,4 @@ -package wasi:filesystem@0.2.0-rc-2023-10-18; +package wasi:filesystem@0.2.0-rc-2023-11-05; world imports { import types; diff --git a/crates/wasi/wit/deps/http/proxy.wit b/crates/wasi/wit/deps/http/proxy.wit index dde0659d6054..7d0e84eb2315 100644 --- a/crates/wasi/wit/deps/http/proxy.wit +++ b/crates/wasi/wit/deps/http/proxy.wit @@ -1,4 +1,4 @@ -package wasi:http@0.2.0-rc-2023-10-18; +package wasi:http@0.2.0-rc-2023-11-05; // The `wasi:http/proxy` world captures a widely-implementable intersection of // hosts that includes HTTP forward and reverse proxies. Components targeting @@ -6,21 +6,21 @@ package wasi:http@0.2.0-rc-2023-10-18; // outgoing HTTP requests. world proxy { // HTTP proxies have access to time and randomness. - import wasi:clocks/wall-clock@0.2.0-rc-2023-10-18; - import wasi:clocks/monotonic-clock@0.2.0-rc-2023-10-18; - import wasi:clocks/timezone@0.2.0-rc-2023-10-18; - import wasi:random/random@0.2.0-rc-2023-10-18; + 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:random/random@0.2.0-rc-2023-11-05; // Proxies have standard output and error streams which are expected to // terminate in a developer-facing console provided by the host. - import wasi:cli/stdout@0.2.0-rc-2023-10-18; - import wasi:cli/stderr@0.2.0-rc-2023-10-18; + import wasi:cli/stdout@0.2.0-rc-2023-11-05; + import wasi:cli/stderr@0.2.0-rc-2023-11-05; // TODO: this is a temporary workaround until component tooling is able to // gracefully handle the absence of stdin. Hosts must return an eof stream // for this import, which is what wasi-libc + tooling will do automatically // when this import is properly removed. - import wasi:cli/stdin@0.2.0-rc-2023-10-18; + import wasi:cli/stdin@0.2.0-rc-2023-11-05; // This is the default handler to use when user code simply wants to make an // HTTP request (e.g., via `fetch()`). diff --git a/crates/wasi/wit/deps/http/types.wit b/crates/wasi/wit/deps/http/types.wit index 2cd2fe2190db..bca0d6528243 100644 --- a/crates/wasi/wit/deps/http/types.wit +++ b/crates/wasi/wit/deps/http/types.wit @@ -2,8 +2,8 @@ // define the HTTP resource types and operations used by the component's // imported and exported interfaces. interface types { - use wasi:io/streams@0.2.0-rc-2023-10-18.{input-stream, output-stream}; - use wasi:io/poll@0.2.0-rc-2023-10-18.{pollable}; + use wasi:io/streams@0.2.0-rc-2023-11-05.{input-stream, output-stream}; + use wasi:io/poll@0.2.0-rc-2023-11-05.{pollable}; // This type corresponds to HTTP standard Methods. variant method { diff --git a/crates/wasi/wit/deps/io/poll.wit b/crates/wasi/wit/deps/io/poll.wit index 047389d214c7..52a4957dc496 100644 --- a/crates/wasi/wit/deps/io/poll.wit +++ b/crates/wasi/wit/deps/io/poll.wit @@ -1,4 +1,4 @@ -package wasi:io@0.2.0-rc-2023-10-18; +package wasi:io@0.2.0-rc-2023-11-05; /// A poll API intended to let users wait for I/O events on multiple handles /// at once. diff --git a/crates/wasi/wit/deps/io/streams.wit b/crates/wasi/wit/deps/io/streams.wit index 968795b2d11d..9442f60c0e16 100644 --- a/crates/wasi/wit/deps/io/streams.wit +++ b/crates/wasi/wit/deps/io/streams.wit @@ -1,4 +1,4 @@ -package wasi:io@0.2.0-rc-2023-10-18; +package wasi:io@0.2.0-rc-2023-11-05; /// WASI I/O is an I/O abstraction API which is currently focused on providing /// stream types. diff --git a/crates/wasi/wit/deps/io/world.wit b/crates/wasi/wit/deps/io/world.wit index 3627c9d687b3..4b9b21da6833 100644 --- a/crates/wasi/wit/deps/io/world.wit +++ b/crates/wasi/wit/deps/io/world.wit @@ -1,4 +1,4 @@ -package wasi:io@0.2.0-rc-2023-10-18; +package wasi:io@0.2.0-rc-2023-11-05; world imports { import streams; diff --git a/crates/wasi/wit/deps/random/world.wit b/crates/wasi/wit/deps/random/world.wit index dcbff9384927..9128dd68f098 100644 --- a/crates/wasi/wit/deps/random/world.wit +++ b/crates/wasi/wit/deps/random/world.wit @@ -1,4 +1,4 @@ -package wasi:random@0.2.0-rc-2023-10-18; +package wasi:random@0.2.0-rc-2023-11-05; world imports { import random; diff --git a/crates/wasi/wit/deps/sockets/ip-name-lookup.wit b/crates/wasi/wit/deps/sockets/ip-name-lookup.wit index 4f94329917c2..5ffe2a217c61 100644 --- a/crates/wasi/wit/deps/sockets/ip-name-lookup.wit +++ b/crates/wasi/wit/deps/sockets/ip-name-lookup.wit @@ -1,6 +1,6 @@ interface ip-name-lookup { - use wasi:io/poll@0.2.0-rc-2023-10-18.{pollable}; + use wasi:io/poll@0.2.0-rc-2023-11-05.{pollable}; use network.{network, error-code, ip-address, ip-address-family}; diff --git a/crates/wasi/wit/deps/sockets/tcp.wit b/crates/wasi/wit/deps/sockets/tcp.wit index c316a724542e..b9073b77515d 100644 --- a/crates/wasi/wit/deps/sockets/tcp.wit +++ b/crates/wasi/wit/deps/sockets/tcp.wit @@ -1,7 +1,7 @@ interface tcp { - use wasi:io/streams@0.2.0-rc-2023-10-18.{input-stream, output-stream}; - use wasi:io/poll@0.2.0-rc-2023-10-18.{pollable}; + use wasi:io/streams@0.2.0-rc-2023-11-05.{input-stream, output-stream}; + use wasi:io/poll@0.2.0-rc-2023-11-05.{pollable}; use network.{network, error-code, ip-socket-address, ip-address-family}; enum shutdown-type { diff --git a/crates/wasi/wit/deps/sockets/udp.wit b/crates/wasi/wit/deps/sockets/udp.wit index a86226f01517..8641cc2c5dbd 100644 --- a/crates/wasi/wit/deps/sockets/udp.wit +++ b/crates/wasi/wit/deps/sockets/udp.wit @@ -1,6 +1,6 @@ interface udp { - use wasi:io/poll@0.2.0-rc-2023-10-18.{pollable}; + use wasi:io/poll@0.2.0-rc-2023-11-05.{pollable}; use network.{network, error-code, ip-socket-address, ip-address-family}; diff --git a/crates/wasi/wit/deps/sockets/world.wit b/crates/wasi/wit/deps/sockets/world.wit index d16530c3894d..979703869c06 100644 --- a/crates/wasi/wit/deps/sockets/world.wit +++ b/crates/wasi/wit/deps/sockets/world.wit @@ -1,4 +1,4 @@ -package wasi:sockets@0.2.0-rc-2023-10-18; +package wasi:sockets@0.2.0-rc-2023-11-05; world imports { import instance-network; diff --git a/crates/wasi/wit/main.wit b/crates/wasi/wit/main.wit index f3a4e60cc604..90aa28ad3c42 100644 --- a/crates/wasi/wit/main.wit +++ b/crates/wasi/wit/main.wit @@ -3,31 +3,31 @@ 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-10-18; - import wasi:clocks/monotonic-clock@0.2.0-rc-2023-10-18; - import wasi:clocks/timezone@0.2.0-rc-2023-10-18; - import wasi:filesystem/types@0.2.0-rc-2023-10-18; - import wasi:filesystem/preopens@0.2.0-rc-2023-10-18; - import wasi:sockets/instance-network@0.2.0-rc-2023-10-18; - import wasi:sockets/ip-name-lookup@0.2.0-rc-2023-10-18; - import wasi:sockets/network@0.2.0-rc-2023-10-18; - import wasi:sockets/tcp-create-socket@0.2.0-rc-2023-10-18; - import wasi:sockets/tcp@0.2.0-rc-2023-10-18; - import wasi:sockets/udp-create-socket@0.2.0-rc-2023-10-18; - import wasi:sockets/udp@0.2.0-rc-2023-10-18; - import wasi:random/random@0.2.0-rc-2023-10-18; - import wasi:random/insecure@0.2.0-rc-2023-10-18; - import wasi:random/insecure-seed@0.2.0-rc-2023-10-18; - import wasi:io/poll@0.2.0-rc-2023-10-18; - import wasi:io/streams@0.2.0-rc-2023-10-18; - import wasi:cli/environment@0.2.0-rc-2023-10-18; - import wasi:cli/exit@0.2.0-rc-2023-10-18; - import wasi:cli/stdin@0.2.0-rc-2023-10-18; - import wasi:cli/stdout@0.2.0-rc-2023-10-18; - import wasi:cli/stderr@0.2.0-rc-2023-10-18; - import wasi:cli/terminal-input@0.2.0-rc-2023-10-18; - import wasi:cli/terminal-output@0.2.0-rc-2023-10-18; - import wasi:cli/terminal-stdin@0.2.0-rc-2023-10-18; - import wasi:cli/terminal-stdout@0.2.0-rc-2023-10-18; - import wasi:cli/terminal-stderr@0.2.0-rc-2023-10-18; + 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 472aeccd3e0f..5e7557ed6d30 100644 --- a/crates/wasi/wit/test.wit +++ b/crates/wasi/wit/test.wit @@ -1,20 +1,20 @@ // only used as part of `test-programs` world test-reactor { - include wasi:cli/reactor@0.2.0-rc-2023-10-18; + include wasi:cli/reactor@0.2.0-rc-2023-11-05; export add-strings: func(s: list) -> u32; export get-strings: func() -> list; - use wasi:io/streams@0.2.0-rc-2023-10-18.{output-stream}; + use wasi:io/streams@0.2.0-rc-2023-11-05.{output-stream}; export write-strings-to: func(o: output-stream) -> result; - use wasi:filesystem/types@0.2.0-rc-2023-10-18.{descriptor-stat}; + use wasi:filesystem/types@0.2.0-rc-2023-11-05.{descriptor-stat}; export pass-an-imported-record: func(d: descriptor-stat) -> string; } world test-command { - include wasi:cli/reactor@0.2.0-rc-2023-10-18; - import wasi:http/types@0.2.0-rc-2023-10-18; - import wasi:http/outgoing-handler@0.2.0-rc-2023-10-18; + include wasi:cli/reactor@0.2.0-rc-2023-11-05; + import wasi:http/types@0.2.0-rc-2023-11-05; + import wasi:http/outgoing-handler@0.2.0-rc-2023-11-05; } diff --git a/tests/all/cli_tests/component-basic.wat b/tests/all/cli_tests/component-basic.wat index 55ce9ed26acc..fbbaffcb6d9c 100644 --- a/tests/all/cli_tests/component-basic.wat +++ b/tests/all/cli_tests/component-basic.wat @@ -7,6 +7,6 @@ (func $run (result (result)) (canon lift (core func $i "run"))) - (instance (export (interface "wasi:cli/run@0.2.0-rc-2023-10-18")) + (instance (export (interface "wasi:cli/run@0.2.0-rc-2023-11-05")) (export "run" (func $run))) )