Skip to content

Commit

Permalink
feat!: Rename reactor to imports (#35)
Browse files Browse the repository at this point in the history
* feat!: Rename reactor to imports

We have established a convention for WASI proposals
to have a world definition called `imports`.

This change updates the `command` world to include
an `imports` world rather than `reactor`. The goal
is to establish consistency with this change as
well as clear up some confusion around command
vs reactors in this context.

Additionally, this change takes advantage of the `include`
syntax to include the `imports` worlds across WASI
proposals.

* fix(ci): pin wit-bindgen 0.15.0
  • Loading branch information
ricochet committed Dec 5, 2023
1 parent c5ec947 commit 266876a
Show file tree
Hide file tree
Showing 9 changed files with 2,160 additions and 2,098 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,5 @@ jobs:
git diff --exit-code
- uses: WebAssembly/wit-abi-up-to-date@v16
with:
worlds: "command reactor"
wit-bindgen: '0.15.0'
worlds: "command imports"
2,092 changes: 1,064 additions & 1,028 deletions command.md

Large diffs are not rendered by default.

2,094 changes: 1,065 additions & 1,029 deletions reactor.md → imports.md

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion wit/command.wit
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package wasi:cli@0.2.0-rc-2023-11-10;

world command {
include reactor;
include imports;

export run;
}
4 changes: 2 additions & 2 deletions wit/deps.lock
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ sha512 = "2c242489801a75466986fe014d730fb3aa7b5c6e56a230c8735e6672711b58bcbe92ba

[io]
url = "https://github.com/WebAssembly/wasi-io/archive/main.tar.gz"
sha256 = "f2e6127b235c37c06be675a904d6acf08db953ea688d78c42892c6ad3bd194e4"
sha512 = "32feefbc115c34bf6968cb6e9dc15e755698ee90648e5a5d84448917c36a318bd61b401195eb64330e2475e1d098bfb8dee1440d594a68e0797748762bd84ae5"
sha256 = "b622db2755978a49d18d35d84d75f66b2b1ed23d7bf413e5c9e152e190cc7d4b"
sha512 = "d19c9004e75bf3ebe3e34cff498c3d7fee04cd57a7fba7ed12a0c5ad842ba5715c009de77a152c57da0500f6ca0986b6791b6f022829bdd5a024f7bc114c2ff6"

[random]
url = "https://github.com/WebAssembly/wasi-random/archive/main.tar.gz"
Expand Down
2 changes: 1 addition & 1 deletion wit/deps/io/poll.wit
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package wasi:io@0.2.0-rc-2023-11-10;
/// A poll API intended to let users wait for I/O events on multiple handles
/// at once.
interface poll {
/// `pollable` epresents a single I/O event which may be ready, or not.
/// `pollable` represents a single I/O event which may be ready, or not.
resource pollable {

/// Return the readiness of a pollable. This function never blocks.
Expand Down
10 changes: 5 additions & 5 deletions wit/deps/io/streams.wit
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ interface streams {
/// let pollable = this.subscribe();
/// while !contents.is_empty() {
/// // Wait for the stream to become writable
/// poll-one(pollable);
/// pollable.block();
/// let Ok(n) = this.check-write(); // eliding error handling
/// let len = min(n, contents.len());
/// let (chunk, rest) = contents.split_at(len);
Expand All @@ -140,7 +140,7 @@ interface streams {
/// }
/// this.flush();
/// // Wait for completion of `flush`
/// poll-one(pollable);
/// pollable.block();
/// // Check for any errors that arose during `flush`
/// let _ = this.check-write(); // eliding error handling
/// ```
Expand Down Expand Up @@ -178,7 +178,7 @@ interface streams {

/// Write zeroes to a stream.
///
/// this should be used precisely like `write` with the exact same
/// This should be used precisely like `write` with the exact same
/// preconditions (must use check-write first), but instead of
/// passing a list of bytes, you simply pass the number of zero-bytes
/// that should be written.
Expand All @@ -199,15 +199,15 @@ interface streams {
/// let pollable = this.subscribe();
/// while num_zeroes != 0 {
/// // Wait for the stream to become writable
/// poll-one(pollable);
/// pollable.block();
/// let Ok(n) = this.check-write(); // eliding error handling
/// let len = min(n, num_zeroes);
/// this.write-zeroes(len); // eliding error handling
/// num_zeroes -= len;
/// }
/// this.flush();
/// // Wait for completion of `flush`
/// poll-one(pollable);
/// pollable.block();
/// // Check for any errors that arose during `flush`
/// let _ = this.check-write(); // eliding error handling
/// ```
Expand Down
20 changes: 20 additions & 0 deletions wit/imports.wit
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
package wasi:cli@0.2.0-rc-2023-11-10;

world imports {
include wasi:clocks/imports@0.2.0-rc-2023-11-10;
include wasi:filesystem/imports@0.2.0-rc-2023-11-10;
include wasi:sockets/imports@0.2.0-rc-2023-11-10;
include wasi:random/imports@0.2.0-rc-2023-11-10;
include wasi:io/imports@0.2.0-rc-2023-11-10;

import environment;
import exit;
import stdin;
import stdout;
import stderr;
import terminal-input;
import terminal-output;
import terminal-stdin;
import terminal-stdout;
import terminal-stderr;
}
31 changes: 0 additions & 31 deletions wit/reactor.wit

This file was deleted.

0 comments on commit 266876a

Please sign in to comment.