Skip to content

Commit

Permalink
Update to WASI 0.2.3 WIT files
Browse files Browse the repository at this point in the history
No major changes here; this just updates WIT files from WASI 0.2.2 to 0.2.3.
  • Loading branch information
sunfishcode committed Dec 12, 2024
1 parent a6eb6f0 commit a1e817c
Show file tree
Hide file tree
Showing 54 changed files with 117 additions and 117 deletions.
26 changes: 13 additions & 13 deletions crates/test-programs/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ wit_bindgen::generate!({
package wasmtime:test;
world test {
include wasi:cli/imports@0.2.2;
include wasi:http/imports@0.2.2;
include wasi:cli/imports@0.2.3;
include wasi:http/imports@0.2.3;
include wasi:config/imports@0.2.0-draft;
include wasi:keyvalue/imports@0.2.0-draft;
}
Expand All @@ -31,17 +31,17 @@ pub mod proxy {
default_bindings_module: "test_programs::proxy",
pub_export_macro: true,
with: {
"wasi:http/types@0.2.2": crate::wasi::http::types,
"wasi:http/outgoing-handler@0.2.2": crate::wasi::http::outgoing_handler,
"wasi:random/random@0.2.2": crate::wasi::random::random,
"wasi:io/error@0.2.2": crate::wasi::io::error,
"wasi:io/poll@0.2.2": crate::wasi::io::poll,
"wasi:io/streams@0.2.2": crate::wasi::io::streams,
"wasi:cli/stdout@0.2.2": crate::wasi::cli::stdout,
"wasi:cli/stderr@0.2.2": crate::wasi::cli::stderr,
"wasi:cli/stdin@0.2.2": crate::wasi::cli::stdin,
"wasi:clocks/monotonic-clock@0.2.2": crate::wasi::clocks::monotonic_clock,
"wasi:clocks/wall-clock@0.2.2": crate::wasi::clocks::wall_clock,
"wasi:http/types@0.2.3": crate::wasi::http::types,
"wasi:http/outgoing-handler@0.2.3": crate::wasi::http::outgoing_handler,
"wasi:random/random@0.2.3": crate::wasi::random::random,
"wasi:io/error@0.2.3": crate::wasi::io::error,
"wasi:io/poll@0.2.3": crate::wasi::io::poll,
"wasi:io/streams@0.2.3": crate::wasi::io::streams,
"wasi:cli/stdout@0.2.3": crate::wasi::cli::stdout,
"wasi:cli/stderr@0.2.3": crate::wasi::cli::stderr,
"wasi:cli/stdin@0.2.3": crate::wasi::cli::stdin,
"wasi:clocks/monotonic-clock@0.2.3": crate::wasi::clocks::monotonic_clock,
"wasi:clocks/wall-clock@0.2.3": crate::wasi::clocks::wall_clock,
},
});
}
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.2;
package wasi:cli@0.2.3;

@since(version = 0.2.0)
world command {
Expand Down
12 changes: 6 additions & 6 deletions crates/wasi-http/wit/deps/cli/imports.wit
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
package wasi:cli@0.2.2;
package wasi:cli@0.2.3;

@since(version = 0.2.0)
world imports {
@since(version = 0.2.0)
include wasi:clocks/imports@0.2.2;
include wasi:clocks/imports@0.2.3;
@since(version = 0.2.0)
include wasi:filesystem/imports@0.2.2;
include wasi:filesystem/imports@0.2.3;
@since(version = 0.2.0)
include wasi:sockets/imports@0.2.2;
include wasi:sockets/imports@0.2.3;
@since(version = 0.2.0)
include wasi:random/imports@0.2.2;
include wasi:random/imports@0.2.3;
@since(version = 0.2.0)
include wasi:io/imports@0.2.2;
include wasi:io/imports@0.2.3;

@since(version = 0.2.0)
import environment;
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,7 +1,7 @@
@since(version = 0.2.0)
interface stdin {
@since(version = 0.2.0)
use wasi:io/streams@0.2.2.{input-stream};
use wasi:io/streams@0.2.3.{input-stream};

@since(version = 0.2.0)
get-stdin: func() -> input-stream;
Expand All @@ -10,7 +10,7 @@ interface stdin {
@since(version = 0.2.0)
interface stdout {
@since(version = 0.2.0)
use wasi:io/streams@0.2.2.{output-stream};
use wasi:io/streams@0.2.3.{output-stream};

@since(version = 0.2.0)
get-stdout: func() -> output-stream;
Expand All @@ -19,7 +19,7 @@ interface stdout {
@since(version = 0.2.0)
interface stderr {
@since(version = 0.2.0)
use wasi:io/streams@0.2.2.{output-stream};
use wasi:io/streams@0.2.3.{output-stream};

@since(version = 0.2.0)
get-stderr: func() -> output-stream;
Expand Down
4 changes: 2 additions & 2 deletions crates/wasi-http/wit/deps/clocks/monotonic-clock.wit
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package wasi:clocks@0.2.2;
package wasi:clocks@0.2.3;
/// WASI Monotonic Clock is a clock API intended to let users measure elapsed
/// time.
///
Expand All @@ -10,7 +10,7 @@ package wasi:clocks@0.2.2;
@since(version = 0.2.0)
interface monotonic-clock {
@since(version = 0.2.0)
use wasi:io/poll@0.2.2.{pollable};
use wasi:io/poll@0.2.3.{pollable};

/// An instant in time, in nanoseconds. An instant is relative to an
/// unspecified initial value, and can only be compared to instances from
Expand Down
2 changes: 1 addition & 1 deletion crates/wasi-http/wit/deps/clocks/timezone.wit
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package wasi:clocks@0.2.2;
package wasi:clocks@0.2.3;

@unstable(feature = clocks-timezone)
interface timezone {
Expand Down
2 changes: 1 addition & 1 deletion crates/wasi-http/wit/deps/clocks/wall-clock.wit
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package wasi:clocks@0.2.2;
package wasi:clocks@0.2.3;
/// WASI Wall Clock is a clock API intended to let users query the current
/// time. The name "wall" makes an analogy to a "clock on the wall", which
/// is not necessarily monotonic as it may be reset.
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.2;
package wasi:clocks@0.2.3;

@since(version = 0.2.0)
world imports {
Expand Down
4 changes: 2 additions & 2 deletions crates/wasi-http/wit/deps/filesystem/preopens.wit
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package wasi:filesystem@0.2.2;
package wasi:filesystem@0.2.3;

@since(version = 0.2.0)
interface preopens {
@since(version = 0.2.0)
use types.{descriptor};

/// Return the set of preopened directories, and their path.
/// Return the set of preopened directories, and their paths.
@since(version = 0.2.0)
get-directories: func() -> list<tuple<descriptor, string>>;
}
10 changes: 5 additions & 5 deletions crates/wasi-http/wit/deps/filesystem/types.wit
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package wasi:filesystem@0.2.2;
package wasi:filesystem@0.2.3;
/// WASI filesystem is a filesystem API primarily intended to let users run WASI
/// programs that access their files on their existing filesystems, without
/// significant overhead.
Expand Down Expand Up @@ -26,9 +26,9 @@ package wasi:filesystem@0.2.2;
@since(version = 0.2.0)
interface types {
@since(version = 0.2.0)
use wasi:io/streams@0.2.2.{input-stream, output-stream, error};
use wasi:io/streams@0.2.3.{input-stream, output-stream, error};
@since(version = 0.2.0)
use wasi:clocks/wall-clock@0.2.2.{datetime};
use wasi:clocks/wall-clock@0.2.3.{datetime};

/// File size or length of a region within a file.
@since(version = 0.2.0)
Expand Down Expand Up @@ -327,7 +327,7 @@ interface types {
/// May fail with an error-code describing why the file cannot be appended.
///
/// Note: This allows using `write-stream`, which is similar to `write` with
/// `O_APPEND` in in POSIX.
/// `O_APPEND` in POSIX.
@since(version = 0.2.0)
append-via-stream: func() -> result<output-stream, error-code>;

Expand Down Expand Up @@ -623,7 +623,7 @@ interface types {
/// replaced. It may also include a secret value chosen by the
/// implementation and not otherwise exposed.
///
/// Implementations are encourated to provide the following properties:
/// Implementations are encouraged to provide the following properties:
///
/// - If the file is not modified or replaced, the computed hash value should
/// usually not change.
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.2;
package wasi:filesystem@0.2.3;

@since(version = 0.2.0)
world imports {
Expand Down
14 changes: 7 additions & 7 deletions crates/wasi-http/wit/deps/http/proxy.wit
Original file line number Diff line number Diff line change
@@ -1,30 +1,30 @@
package wasi:http@0.2.2;
package wasi:http@0.2.3;

/// The `wasi:http/imports` world imports all the APIs for HTTP proxies.
/// It is intended to be `include`d in other worlds.
@since(version = 0.2.0)
world imports {
/// HTTP proxies have access to time and randomness.
@since(version = 0.2.0)
import wasi:clocks/monotonic-clock@0.2.2;
import wasi:clocks/monotonic-clock@0.2.3;
@since(version = 0.2.0)
import wasi:clocks/wall-clock@0.2.2;
import wasi:clocks/wall-clock@0.2.3;
@since(version = 0.2.0)
import wasi:random/random@0.2.2;
import wasi:random/random@0.2.3;

/// Proxies have standard output and error streams which are expected to
/// terminate in a developer-facing console provided by the host.
@since(version = 0.2.0)
import wasi:cli/stdout@0.2.2;
import wasi:cli/stdout@0.2.3;
@since(version = 0.2.0)
import wasi:cli/stderr@0.2.2;
import wasi:cli/stderr@0.2.3;

/// 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.
@since(version = 0.2.0)
import wasi:cli/stdin@0.2.2;
import wasi:cli/stdin@0.2.3;

/// This is the default handler to use when user code simply wants to make an
/// HTTP request (e.g., via `fetch()`).
Expand Down
10 changes: 5 additions & 5 deletions crates/wasi-http/wit/deps/http/types.wit
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
@since(version = 0.2.0)
interface types {
@since(version = 0.2.0)
use wasi:clocks/monotonic-clock@0.2.2.{duration};
use wasi:clocks/monotonic-clock@0.2.3.{duration};
@since(version = 0.2.0)
use wasi:io/streams@0.2.2.{input-stream, output-stream};
use wasi:io/streams@0.2.3.{input-stream, output-stream};
@since(version = 0.2.0)
use wasi:io/error@0.2.2.{error as io-error};
use wasi:io/error@0.2.3.{error as io-error};
@since(version = 0.2.0)
use wasi:io/poll@0.2.2.{pollable};
use wasi:io/poll@0.2.3.{pollable};

/// This type corresponds to HTTP standard Methods.
@since(version = 0.2.0)
Expand All @@ -36,7 +36,7 @@ interface types {
}

/// These cases are inspired by the IANA HTTP Proxy Error Types:
/// https://www.iana.org/assignments/http-proxy-status/http-proxy-status.xhtml#table-http-proxy-error-types
/// <https://www.iana.org/assignments/http-proxy-status/http-proxy-status.xhtml#table-http-proxy-error-types>
@since(version = 0.2.0)
variant error-code {
DNS-timeout,
Expand Down
2 changes: 1 addition & 1 deletion crates/wasi-http/wit/deps/io/error.wit
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package wasi:io@0.2.2;
package wasi:io@0.2.3;

@since(version = 0.2.0)
interface error {
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.2;
package wasi:io@0.2.3;

/// 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.2;
package wasi:io@0.2.3;

/// 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.2;
package wasi:io@0.2.3;

@since(version = 0.2.0)
world imports {
Expand Down
2 changes: 1 addition & 1 deletion crates/wasi-http/wit/deps/random/insecure-seed.wit
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package wasi:random@0.2.2;
package wasi:random@0.2.3;
/// The insecure-seed interface for seeding hash-map DoS resistance.
///
/// It is intended to be portable at least between Unix-family platforms and
Expand Down
2 changes: 1 addition & 1 deletion crates/wasi-http/wit/deps/random/insecure.wit
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package wasi:random@0.2.2;
package wasi:random@0.2.3;
/// The insecure interface for insecure pseudo-random numbers.
///
/// It is intended to be portable at least between Unix-family platforms and
Expand Down
2 changes: 1 addition & 1 deletion crates/wasi-http/wit/deps/random/random.wit
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package wasi:random@0.2.2;
package wasi:random@0.2.3;
/// WASI Random is a random data API.
///
/// It is intended to be portable at least between Unix-family platforms and
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.2;
package wasi:random@0.2.3;

@since(version = 0.2.0)
world imports {
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,7 +1,7 @@
@since(version = 0.2.0)
interface ip-name-lookup {
@since(version = 0.2.0)
use wasi:io/poll@0.2.2.{pollable};
use wasi:io/poll@0.2.3.{pollable};
@since(version = 0.2.0)
use network.{network, error-code, ip-address};

Expand Down
2 changes: 1 addition & 1 deletion crates/wasi-http/wit/deps/sockets/network.wit
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
@since(version = 0.2.0)
interface network {
@unstable(feature = network-error-code)
use wasi:io/error@0.2.2.{error};
use wasi:io/error@0.2.3.{error};

/// An opaque resource that represents access to (a subset of) the network.
/// This enables context-based security for networking.
Expand Down
6 changes: 3 additions & 3 deletions crates/wasi-http/wit/deps/sockets/tcp.wit
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
@since(version = 0.2.0)
interface tcp {
@since(version = 0.2.0)
use wasi:io/streams@0.2.2.{input-stream, output-stream};
use wasi:io/streams@0.2.3.{input-stream, output-stream};
@since(version = 0.2.0)
use wasi:io/poll@0.2.2.{pollable};
use wasi:io/poll@0.2.3.{pollable};
@since(version = 0.2.0)
use wasi:clocks/monotonic-clock@0.2.2.{duration};
use wasi:clocks/monotonic-clock@0.2.3.{duration};
@since(version = 0.2.0)
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/udp.wit
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
@since(version = 0.2.0)
interface udp {
@since(version = 0.2.0)
use wasi:io/poll@0.2.2.{pollable};
use wasi:io/poll@0.2.3.{pollable};
@since(version = 0.2.0)
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.2;
package wasi:sockets@0.2.3;

@since(version = 0.2.0)
world imports {
Expand Down
2 changes: 1 addition & 1 deletion crates/wasi-http/wit/world.wit
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
package wasmtime:wasi-http;

world bindings {
include wasi:http/proxy@0.2.2;
include wasi:http/proxy@0.2.3;
}
18 changes: 9 additions & 9 deletions crates/wasi-preview1-component-adapter/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -91,12 +91,12 @@ pub mod bindings {
package wasmtime:adapter;
world adapter {
import wasi:clocks/wall-clock@0.2.2;
import wasi:clocks/monotonic-clock@0.2.2;
import wasi:random/random@0.2.2;
import wasi:cli/stdout@0.2.2;
import wasi:cli/stderr@0.2.2;
import wasi:cli/stdin@0.2.2;
import wasi:clocks/wall-clock@0.2.3;
import wasi:clocks/monotonic-clock@0.2.3;
import wasi:random/random@0.2.3;
import wasi:cli/stdout@0.2.3;
import wasi:cli/stderr@0.2.3;
import wasi:cli/stdin@0.2.3;
}
"#,
world: "wasmtime:adapter/adapter",
Expand All @@ -114,7 +114,7 @@ pub mod bindings {
}
}

#[export_name = "wasi:cli/run@0.2.2#run"]
#[export_name = "wasi:cli/run@0.2.3#run"]
#[cfg(feature = "command")]
pub unsafe extern "C" fn run() -> u32 {
#[link(wasm_import_module = "__main_module__")]
Expand Down Expand Up @@ -456,7 +456,7 @@ impl BumpAlloc {
}

#[cfg(not(feature = "proxy"))]
#[link(wasm_import_module = "wasi:cli/environment@0.2.2")]
#[link(wasm_import_module = "wasi:cli/environment@0.2.3")]
extern "C" {
#[link_name = "get-arguments"]
fn wasi_cli_get_arguments(rval: *mut WasmStrList);
Expand Down Expand Up @@ -2155,7 +2155,7 @@ pub unsafe extern "C" fn poll_oneoff(
});
}

#[link(wasm_import_module = "wasi:io/poll@0.2.2")]
#[link(wasm_import_module = "wasi:io/poll@0.2.3")]
extern "C" {
#[link_name = "poll"]
fn poll_import(pollables: *const Pollable, len: usize, rval: *mut ReadyList);
Expand Down
Loading

0 comments on commit a1e817c

Please sign in to comment.