Skip to content

Commit

Permalink
Update WASI versions to 0.2.0-rc-2023-11-05 (#7302)
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
alexcrichton authored Oct 19, 2023
1 parent 183cb0f commit 11b6001
Show file tree
Hide file tree
Showing 45 changed files with 174 additions and 174 deletions.
6 changes: 3 additions & 3 deletions crates/wasi-http/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions crates/wasi-http/wit/command-extended.wit
Original file line number Diff line number Diff line change
@@ -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;
}
2 changes: 1 addition & 1 deletion crates/wasi-http/wit/deps/cli/command.wit
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
36 changes: 18 additions & 18 deletions crates/wasi-http/wit/deps/cli/reactor.wit
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
6 changes: 3 additions & 3 deletions crates/wasi-http/wit/deps/cli/stdio.wit
Original file line number Diff line number Diff line change
@@ -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;
}
2 changes: 1 addition & 1 deletion crates/wasi-http/wit/deps/clocks/monotonic-clock.wit
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion crates/wasi-http/wit/deps/clocks/world.wit
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
4 changes: 2 additions & 2 deletions crates/wasi-http/wit/deps/filesystem/types.wit
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion crates/wasi-http/wit/deps/filesystem/world.wit
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
16 changes: 8 additions & 8 deletions crates/wasi-http/wit/deps/http/proxy.wit
Original file line number Diff line number Diff line change
@@ -1,26 +1,26 @@
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
// this world may concurrently stream in and out any number of incoming and
// 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()`).
Expand Down
4 changes: 2 additions & 2 deletions crates/wasi-http/wit/deps/http/types.wit
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion crates/wasi-http/wit/deps/io/poll.wit
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
2 changes: 1 addition & 1 deletion crates/wasi-http/wit/deps/io/streams.wit
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
2 changes: 1 addition & 1 deletion crates/wasi-http/wit/deps/io/world.wit
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion crates/wasi-http/wit/deps/random/world.wit
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion crates/wasi-http/wit/deps/sockets/ip-name-lookup.wit
Original file line number Diff line number Diff line change
@@ -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};


Expand Down
4 changes: 2 additions & 2 deletions crates/wasi-http/wit/deps/sockets/tcp.wit
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion crates/wasi-http/wit/deps/sockets/udp.wit
Original file line number Diff line number Diff line change
@@ -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};


Expand Down
2 changes: 1 addition & 1 deletion crates/wasi-http/wit/deps/sockets/world.wit
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
54 changes: 27 additions & 27 deletions crates/wasi-http/wit/main.wit
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
12 changes: 6 additions & 6 deletions crates/wasi-http/wit/test.wit
Original file line number Diff line number Diff line change
@@ -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<string>) -> u32;
export get-strings: func() -> list<string>;

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;
}
2 changes: 1 addition & 1 deletion crates/wasi-preview1-component-adapter/src/descriptors.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
Expand Down
8 changes: 4 additions & 4 deletions crates/wasi-preview1-component-adapter/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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__")]
Expand Down Expand Up @@ -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"]
Expand Down Expand Up @@ -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);
Expand All @@ -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);
Expand Down
6 changes: 3 additions & 3 deletions crates/wasi/src/preview2/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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: {
Expand Down
4 changes: 2 additions & 2 deletions crates/wasi/wit/command-extended.wit
Original file line number Diff line number Diff line change
@@ -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;
}
2 changes: 1 addition & 1 deletion crates/wasi/wit/deps/cli/command.wit
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Loading

0 comments on commit 11b6001

Please sign in to comment.