Skip to content

Commit d6f0f84

Browse files
alexcrichtonbongjunj
alexcrichton
authored and
bongjunj
committed
Update WASIp3 WITs to a tagged release (bytecodealliance#11443)
* Update WASIp3 WITs to a tagged release Now that there's an official tag it's best to use that, and this'll help keep everything in sync as well. * Fix doc tests
1 parent 5547fd6 commit d6f0f84

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+457
-443
lines changed

‎ci/vendor-wit.sh‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -69,20 +69,20 @@ make_vendor "wasi-config" "config@f4d699b"
6969
make_vendor "wasi-keyvalue" "keyvalue@219ea36"
7070

7171
make_vendor "wasi/src/p3" "
72-
cli@939bd6d@wit-0.3.0-draft
73-
clocks@13d1c82@wit-0.3.0-draft
74-
filesystem@2007d36@wit-0.3.0-draft
75-
random@4e94663@wit-0.3.0-draft
76-
sockets@bc1b8b1@wit-0.3.0-draft
72+
cli@v0.3.0-rc-2025-08-15@wit-0.3.0-draft
73+
clocks@v0.3.0-rc-2025-08-15@wit-0.3.0-draft
74+
filesystem@v0.3.0-rc-2025-08-15@wit-0.3.0-draft
75+
random@v0.3.0-rc-2025-08-15@wit-0.3.0-draft
76+
sockets@v0.3.0-rc-2025-08-15@wit-0.3.0-draft
7777
"
7878

7979
make_vendor "wasi-http/src/p3" "
80-
cli@939bd6d@wit-0.3.0-draft
81-
clocks@13d1c82@wit-0.3.0-draft
82-
filesystem@2007d36@wit-0.3.0-draft
83-
http@376b674@wit-0.3.0-draft
84-
random@4e94663@wit-0.3.0-draft
85-
sockets@bc1b8b1@wit-0.3.0-draft
80+
cli@v0.3.0-rc-2025-08-15@wit-0.3.0-draft
81+
clocks@v0.3.0-rc-2025-08-15@wit-0.3.0-draft
82+
filesystem@v0.3.0-rc-2025-08-15@wit-0.3.0-draft
83+
http@v0.3.0-rc-2025-08-15@wit-0.3.0-draft
84+
random@v0.3.0-rc-2025-08-15@wit-0.3.0-draft
85+
sockets@v0.3.0-rc-2025-08-15@wit-0.3.0-draft
8686
"
8787

8888
rm -rf $cache_dir

‎crates/test-programs/src/bin/p3_cli.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ impl test_programs::p3::exports::wasi::cli::run::Guest for Component {
1212
async fn run() -> Result<(), ()> {
1313
assert_eq!(environment::get_arguments(), ["p3_cli.component", "."]);
1414
assert_ne!(environment::get_environment(), []);
15-
assert_eq!(environment::initial_cwd(), None);
15+
assert_eq!(environment::get_initial_cwd(), None);
1616

1717
assert!(terminal_stdin::get_terminal_stdin().is_none());
1818
assert!(terminal_stdout::get_terminal_stdout().is_none());

‎crates/test-programs/src/bin/p3_http_middleware_with_chain.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ mod bindings {
66
package local:local;
77
88
world middleware-with-chain {
9-
include wasi:http/[email protected]draft;
9+
include wasi:http/[email protected]rc-2025-08-15;
1010
1111
import chain-http;
1212
}
1313
1414
interface chain-http {
15-
use wasi:http/[email protected]draft.{request, response, error-code};
15+
use wasi:http/[email protected]rc-2025-08-15.{request, response, error-code};
1616
1717
handle: async func(request: request) -> result<response, error-code>;
1818
}

‎crates/test-programs/src/bin/p3_random_imports.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ impl test_programs::p3::exports::wasi::cli::run::Guest for Component {
2020
}
2121

2222
// The `insecure_seed` API should return the same result each time.
23-
let (a1, b1) = random::insecure_seed::insecure_seed();
24-
let (a2, b2) = random::insecure_seed::insecure_seed();
23+
let (a1, b1) = random::insecure_seed::get_insecure_seed();
24+
let (a2, b2) = random::insecure_seed::get_insecure_seed();
2525
assert_eq!(a1, a2);
2626
assert_eq!(b1, b2);
2727

‎crates/test-programs/src/p3/mod.rs‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,20 @@ wit_bindgen::generate!({
66
package wasmtime:test;
77
88
world testp3 {
9-
include wasi:cli/[email protected];
10-
include wasi:http/[email protected]draft;
9+
include wasi:cli/[email protected]-rc-2025-08-15;
10+
include wasi:http/[email protected]rc-2025-08-15;
1111
12-
export wasi:cli/[email protected];
12+
export wasi:cli/[email protected]-rc-2025-08-15;
1313
}
1414
",
1515
path: "../wasi-http/src/p3/wit",
1616
world: "wasmtime:test/testp3",
1717
default_bindings_module: "test_programs::p3",
1818
pub_export_macro: true,
1919
async: [
20-
"wasi:cli/[email protected]#run",
20+
"wasi:cli/[email protected]-rc-2025-08-15#run",
2121
],
22-
generate_all
22+
generate_all,
2323
});
2424

2525
pub mod proxy {
@@ -28,22 +28,22 @@ pub mod proxy {
2828
package wasmtime:test;
2929
3030
world proxyp3 {
31-
include wasi:http/[email protected]draft;
31+
include wasi:http/[email protected]rc-2025-08-15;
3232
}
3333
",
3434
path: "../wasi-http/src/p3/wit",
3535
world: "wasmtime:test/proxyp3",
3636
default_bindings_module: "test_programs::p3::proxy",
3737
pub_export_macro: true,
3838
with: {
39-
"wasi:http/[email protected]draft": generate,
40-
"wasi:http/[email protected]draft": crate::p3::wasi::http::types,
41-
"wasi:random/[email protected]": crate::p3::wasi::random::random,
42-
"wasi:cli/[email protected]": crate::p3::wasi::cli::stdout,
43-
"wasi:cli/[email protected]": crate::p3::wasi::cli::stderr,
44-
"wasi:cli/[email protected]": crate::p3::wasi::cli::stdin,
45-
"wasi:clocks/[email protected]": crate::p3::wasi::clocks::monotonic_clock,
46-
"wasi:clocks/[email protected]": crate::p3::wasi::clocks::wall_clock,
39+
"wasi:http/[email protected]rc-2025-08-15": generate,
40+
"wasi:http/[email protected]rc-2025-08-15": crate::p3::wasi::http::types,
41+
"wasi:random/[email protected]-rc-2025-08-15": crate::p3::wasi::random::random,
42+
"wasi:cli/[email protected]-rc-2025-08-15": crate::p3::wasi::cli::stdout,
43+
"wasi:cli/[email protected]-rc-2025-08-15": crate::p3::wasi::cli::stderr,
44+
"wasi:cli/[email protected]-rc-2025-08-15": crate::p3::wasi::cli::stdin,
45+
"wasi:clocks/[email protected]-rc-2025-08-15": crate::p3::wasi::clocks::monotonic_clock,
46+
"wasi:clocks/[email protected]-rc-2025-08-15": crate::p3::wasi::clocks::wall_clock,
4747
},
4848
});
4949
}

‎crates/wasi-http/src/p3/wit/deps/cli/command.wit‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
package wasi:cli@0.3.0;
1+
package wasi:cli@0.3.0-rc-2025-08-15;
22

3-
@since(version = 0.3.0)
3+
@since(version = 0.3.0-rc-2025-08-15)
44
world command {
5-
@since(version = 0.3.0)
5+
@since(version = 0.3.0-rc-2025-08-15)
66
include imports;
77

8-
@since(version = 0.3.0)
8+
@since(version = 0.3.0-rc-2025-08-15)
99
export run;
1010
}

‎crates/wasi-http/src/p3/wit/deps/cli/environment.wit‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@since(version = 0.3.0)
1+
@since(version = 0.3.0-rc-2025-08-15)
22
interface environment {
33
/// Get the POSIX-style environment variables.
44
///
@@ -8,15 +8,15 @@ interface environment {
88
/// Morally, these are a value import, but until value imports are available
99
/// in the component model, this import function should return the same
1010
/// values each time it is called.
11-
@since(version = 0.3.0)
11+
@since(version = 0.3.0-rc-2025-08-15)
1212
get-environment: func() -> list<tuple<string, string>>;
1313

1414
/// Get the POSIX-style arguments to the program.
15-
@since(version = 0.3.0)
15+
@since(version = 0.3.0-rc-2025-08-15)
1616
get-arguments: func() -> list<string>;
1717

1818
/// Return a path that programs should use as their initial current working
1919
/// directory, interpreting `.` as shorthand for this.
20-
@since(version = 0.3.0)
21-
initial-cwd: func() -> option<string>;
20+
@since(version = 0.3.0-rc-2025-08-15)
21+
get-initial-cwd: func() -> option<string>;
2222
}

‎crates/wasi-http/src/p3/wit/deps/cli/exit.wit‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
@since(version = 0.3.0)
1+
@since(version = 0.3.0-rc-2025-08-15)
22
interface exit {
33
/// Exit the current instance and any linked instances.
4-
@since(version = 0.3.0)
4+
@since(version = 0.3.0-rc-2025-08-15)
55
exit: func(status: result);
66

77
/// Exit the current instance and any linked instances, reporting the

‎crates/wasi-http/src/p3/wit/deps/cli/imports.wit‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,34 @@
1-
package wasi:cli@0.3.0;
1+
package wasi:cli@0.3.0-rc-2025-08-15;
22

3-
@since(version = 0.3.0)
3+
@since(version = 0.3.0-rc-2025-08-15)
44
world imports {
5-
@since(version = 0.3.0)
6-
include wasi:clocks/imports@0.3.0;
7-
@since(version = 0.3.0)
8-
include wasi:filesystem/imports@0.3.0;
9-
@since(version = 0.3.0)
10-
include wasi:sockets/imports@0.3.0;
11-
@since(version = 0.3.0)
12-
include wasi:random/imports@0.3.0;
5+
@since(version = 0.3.0-rc-2025-08-15)
6+
include wasi:clocks/imports@0.3.0-rc-2025-08-15;
7+
@since(version = 0.3.0-rc-2025-08-15)
8+
include wasi:filesystem/imports@0.3.0-rc-2025-08-15;
9+
@since(version = 0.3.0-rc-2025-08-15)
10+
include wasi:sockets/imports@0.3.0-rc-2025-08-15;
11+
@since(version = 0.3.0-rc-2025-08-15)
12+
include wasi:random/imports@0.3.0-rc-2025-08-15;
1313

14-
@since(version = 0.3.0)
14+
@since(version = 0.3.0-rc-2025-08-15)
1515
import environment;
16-
@since(version = 0.3.0)
16+
@since(version = 0.3.0-rc-2025-08-15)
1717
import exit;
18-
@since(version = 0.3.0)
18+
@since(version = 0.3.0-rc-2025-08-15)
1919
import stdin;
20-
@since(version = 0.3.0)
20+
@since(version = 0.3.0-rc-2025-08-15)
2121
import stdout;
22-
@since(version = 0.3.0)
22+
@since(version = 0.3.0-rc-2025-08-15)
2323
import stderr;
24-
@since(version = 0.3.0)
24+
@since(version = 0.3.0-rc-2025-08-15)
2525
import terminal-input;
26-
@since(version = 0.3.0)
26+
@since(version = 0.3.0-rc-2025-08-15)
2727
import terminal-output;
28-
@since(version = 0.3.0)
28+
@since(version = 0.3.0-rc-2025-08-15)
2929
import terminal-stdin;
30-
@since(version = 0.3.0)
30+
@since(version = 0.3.0-rc-2025-08-15)
3131
import terminal-stdout;
32-
@since(version = 0.3.0)
32+
@since(version = 0.3.0-rc-2025-08-15)
3333
import terminal-stderr;
3434
}

‎crates/wasi-http/src/p3/wit/deps/cli/run.wit‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
@since(version = 0.3.0)
1+
@since(version = 0.3.0-rc-2025-08-15)
22
interface run {
33
/// Run the program.
4-
@since(version = 0.3.0)
4+
@since(version = 0.3.0-rc-2025-08-15)
55
run: func() -> result;
66
}

0 commit comments

Comments
 (0)