Skip to content

Commit 7a0889a

Browse files
authored
Merge pull request #93 from WebAssembly/pch/rc_12_05
update release candidate to 0.2.0-rc-2023-12-05
2 parents 012b7bd + 8d2e735 commit 7a0889a

File tree

9 files changed

+136
-68
lines changed

9 files changed

+136
-68
lines changed

.github/workflows/main.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,3 +17,5 @@ jobs:
1717
chmod +x ./wit-deps
1818
./wit-deps lock --check
1919
- uses: WebAssembly/wit-abi-up-to-date@v16
20+
with:
21+
wit-bindgen: '0.15.0'

proxy.md

Lines changed: 98 additions & 21 deletions
Large diffs are not rendered by default.

wit/deps.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[cli]
22
url = "https://github.com/WebAssembly/wasi-cli/archive/main.tar.gz"
3-
sha256 = "fb029d0f9468fcb404a079a58fafd9265ef99c0ee1350835348da7b6e105c597"
4-
sha512 = "8602e881281adc67b1ac5a4eb0888636d6f50d15bd14e36dcc446a51551f3f9bb3e9eabb776d723bb113bf1e26a702c5042de095e66e897c3d3cf689e0b7d4f9"
3+
sha256 = "6894203a2ac50a68f6b91f2174826c2987cc0efc94ad1f8f14f8460e262fc103"
4+
sha512 = "349776db1b1455e176ca61a1a8ec653f77b888d291e948feded3b6b46350c65973e9e75cc0bf8649256654001af2408eacc585c31454008c86ff53b301da5c32"
55

66
[clocks]
77
url = "https://github.com/WebAssembly/wasi-clocks/archive/main.tar.gz"
@@ -15,8 +15,8 @@ sha512 = "2c242489801a75466986fe014d730fb3aa7b5c6e56a230c8735e6672711b58bcbe92ba
1515

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

2121
[random]
2222
url = "https://github.com/WebAssembly/wasi-random/archive/main.tar.gz"

wit/deps/cli/command.wit

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
package wasi:cli@0.2.0-rc-2023-11-10;
1+
package wasi:cli@0.2.0-rc-2023-12-05;
22

33
world command {
4-
include reactor;
4+
include imports;
55

66
export run;
77
}

wit/deps/cli/imports.wit

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
package wasi:cli@0.2.0-rc-2023-12-05;
2+
3+
world imports {
4+
include wasi:clocks/imports@0.2.0-rc-2023-11-10;
5+
include wasi:filesystem/imports@0.2.0-rc-2023-11-10;
6+
include wasi:sockets/imports@0.2.0-rc-2023-11-10;
7+
include wasi:random/imports@0.2.0-rc-2023-11-10;
8+
include wasi:io/imports@0.2.0-rc-2023-11-10;
9+
10+
import environment;
11+
import exit;
12+
import stdin;
13+
import stdout;
14+
import stderr;
15+
import terminal-input;
16+
import terminal-output;
17+
import terminal-stdin;
18+
import terminal-stdout;
19+
import terminal-stderr;
20+
}

wit/deps/cli/reactor.wit

Lines changed: 0 additions & 31 deletions
This file was deleted.

wit/deps/io/poll.wit

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package wasi:io@0.2.0-rc-2023-11-10;
33
/// A poll API intended to let users wait for I/O events on multiple handles
44
/// at once.
55
interface poll {
6-
/// `pollable` epresents a single I/O event which may be ready, or not.
6+
/// `pollable` represents a single I/O event which may be ready, or not.
77
resource pollable {
88

99
/// Return the readiness of a pollable. This function never blocks.

wit/deps/io/streams.wit

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ interface streams {
131131
/// let pollable = this.subscribe();
132132
/// while !contents.is_empty() {
133133
/// // Wait for the stream to become writable
134-
/// poll-one(pollable);
134+
/// pollable.block();
135135
/// let Ok(n) = this.check-write(); // eliding error handling
136136
/// let len = min(n, contents.len());
137137
/// let (chunk, rest) = contents.split_at(len);
@@ -140,7 +140,7 @@ interface streams {
140140
/// }
141141
/// this.flush();
142142
/// // Wait for completion of `flush`
143-
/// poll-one(pollable);
143+
/// pollable.block();
144144
/// // Check for any errors that arose during `flush`
145145
/// let _ = this.check-write(); // eliding error handling
146146
/// ```
@@ -178,7 +178,7 @@ interface streams {
178178

179179
/// Write zeroes to a stream.
180180
///
181-
/// this should be used precisely like `write` with the exact same
181+
/// This should be used precisely like `write` with the exact same
182182
/// preconditions (must use check-write first), but instead of
183183
/// passing a list of bytes, you simply pass the number of zero-bytes
184184
/// that should be written.
@@ -199,15 +199,15 @@ interface streams {
199199
/// let pollable = this.subscribe();
200200
/// while num_zeroes != 0 {
201201
/// // Wait for the stream to become writable
202-
/// poll-one(pollable);
202+
/// pollable.block();
203203
/// let Ok(n) = this.check-write(); // eliding error handling
204204
/// let len = min(n, num_zeroes);
205205
/// this.write-zeroes(len); // eliding error handling
206206
/// num_zeroes -= len;
207207
/// }
208208
/// this.flush();
209209
/// // Wait for completion of `flush`
210-
/// poll-one(pollable);
210+
/// pollable.block();
211211
/// // Check for any errors that arose during `flush`
212212
/// let _ = this.check-write(); // eliding error handling
213213
/// ```

wit/proxy.wit

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package wasi:http@0.2.0-rc-2023-11-10;
1+
package wasi:http@0.2.0-rc-2023-12-05;
22

33
/// The `wasi:http/proxy` world captures a widely-implementable intersection of
44
/// hosts that includes HTTP forward and reverse proxies. Components targeting
@@ -11,14 +11,14 @@ world proxy {
1111

1212
/// Proxies have standard output and error streams which are expected to
1313
/// terminate in a developer-facing console provided by the host.
14-
import wasi:cli/stdout@0.2.0-rc-2023-11-10;
15-
import wasi:cli/stderr@0.2.0-rc-2023-11-10;
14+
import wasi:cli/stdout@0.2.0-rc-2023-12-05;
15+
import wasi:cli/stderr@0.2.0-rc-2023-12-05;
1616

1717
/// TODO: this is a temporary workaround until component tooling is able to
1818
/// gracefully handle the absence of stdin. Hosts must return an eof stream
1919
/// for this import, which is what wasi-libc + tooling will do automatically
2020
/// when this import is properly removed.
21-
import wasi:cli/stdin@0.2.0-rc-2023-11-10;
21+
import wasi:cli/stdin@0.2.0-rc-2023-12-05;
2222

2323
/// This is the default handler to use when user code simply wants to make an
2424
/// HTTP request (e.g., via `fetch()`).

0 commit comments

Comments
 (0)