Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ci/vendor-wit.sh
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ get_github() {
}

p2=0.2.12
p3=0.3.0-rc-2026-03-15
p3=0.3.0

rm -rf crates/wasi-io/wit/deps
mkdir -p crates/wasi-io/wit/deps
Expand Down
2 changes: 1 addition & 1 deletion crates/test-programs/src/bin/p3_cli_many_tasks.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use test_programs::p3::wasi as wasip3;

#[link(wasm_import_module = "wasi:clocks/monotonic-clock@0.3.0-rc-2026-03-15")]
#[link(wasm_import_module = "wasi:clocks/monotonic-clock@0.3.0")]
unsafe extern "C" {
#[link_name = "[async-lower]wait-for"]
fn wait_for(dur: u64) -> u32;
Expand Down
26 changes: 13 additions & 13 deletions crates/test-programs/src/bin/p3_http_middleware.rs
Original file line number Diff line number Diff line change
Expand Up @@ -18,19 +18,19 @@ wit_bindgen::generate!({
path: "../wasi-http/src/p3/wit",
world: "wasi:http/middleware",
with: {
"wasi:http/handler@0.3.0-rc-2026-03-15": test_programs::p3::wasi::http::handler,
"wasi:http/types@0.3.0-rc-2026-03-15": test_programs::p3::wasi::http::types,
"wasi:http/client@0.3.0-rc-2026-03-15": test_programs::p3::wasi::http::client,
"wasi:random/random@0.3.0-rc-2026-03-15": test_programs::p3::wasi::random::random,
"wasi:random/insecure@0.3.0-rc-2026-03-15": test_programs::p3::wasi::random::insecure,
"wasi:random/insecure-seed@0.3.0-rc-2026-03-15": test_programs::p3::wasi::random::insecure_seed,
"wasi:cli/stdout@0.3.0-rc-2026-03-15": test_programs::p3::wasi::cli::stdout,
"wasi:cli/stderr@0.3.0-rc-2026-03-15": test_programs::p3::wasi::cli::stderr,
"wasi:cli/stdin@0.3.0-rc-2026-03-15": test_programs::p3::wasi::cli::stdin,
"wasi:cli/types@0.3.0-rc-2026-03-15": test_programs::p3::wasi::cli::types,
"wasi:clocks/monotonic-clock@0.3.0-rc-2026-03-15": test_programs::p3::wasi::clocks::monotonic_clock,
"wasi:clocks/system-clock@0.3.0-rc-2026-03-15": test_programs::p3::wasi::clocks::system_clock,
"wasi:clocks/types@0.3.0-rc-2026-03-15": test_programs::p3::wasi::clocks::types,
"wasi:http/handler@0.3.0": test_programs::p3::wasi::http::handler,
"wasi:http/types@0.3.0": test_programs::p3::wasi::http::types,
"wasi:http/client@0.3.0": test_programs::p3::wasi::http::client,
"wasi:random/random@0.3.0": test_programs::p3::wasi::random::random,
"wasi:random/insecure@0.3.0": test_programs::p3::wasi::random::insecure,
"wasi:random/insecure-seed@0.3.0": test_programs::p3::wasi::random::insecure_seed,
"wasi:cli/stdout@0.3.0": test_programs::p3::wasi::cli::stdout,
"wasi:cli/stderr@0.3.0": test_programs::p3::wasi::cli::stderr,
"wasi:cli/stdin@0.3.0": test_programs::p3::wasi::cli::stdin,
"wasi:cli/types@0.3.0": test_programs::p3::wasi::cli::types,
"wasi:clocks/monotonic-clock@0.3.0": test_programs::p3::wasi::clocks::monotonic_clock,
"wasi:clocks/system-clock@0.3.0": test_programs::p3::wasi::clocks::system_clock,
"wasi:clocks/types@0.3.0": test_programs::p3::wasi::clocks::types,
},
});

Expand Down
28 changes: 14 additions & 14 deletions crates/test-programs/src/bin/p3_http_middleware_with_chain.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,32 +6,32 @@ mod bindings {
package local:local;

world middleware-with-chain {
include wasi:http/service@0.3.0-rc-2026-03-15;
include wasi:http/service@0.3.0;

import chain-http;
}

interface chain-http {
use wasi:http/types@0.3.0-rc-2026-03-15.{request, response, error-code};
use wasi:http/types@0.3.0.{request, response, error-code};

handle: async func(request: request) -> result<response, error-code>;
}
",
// workaround https://github.com/bytecodealliance/wit-bindgen/issues/1544
// generate_all
with: {
"wasi:http/types@0.3.0-rc-2026-03-15": test_programs::p3::wasi::http::types,
"wasi:http/client@0.3.0-rc-2026-03-15": test_programs::p3::wasi::http::client,
"wasi:random/random@0.3.0-rc-2026-03-15": test_programs::p3::wasi::random::random,
"wasi:random/insecure@0.3.0-rc-2026-03-15": test_programs::p3::wasi::random::insecure,
"wasi:random/insecure-seed@0.3.0-rc-2026-03-15": test_programs::p3::wasi::random::insecure_seed,
"wasi:cli/stdout@0.3.0-rc-2026-03-15": test_programs::p3::wasi::cli::stdout,
"wasi:cli/stderr@0.3.0-rc-2026-03-15": test_programs::p3::wasi::cli::stderr,
"wasi:cli/stdin@0.3.0-rc-2026-03-15": test_programs::p3::wasi::cli::stdin,
"wasi:cli/types@0.3.0-rc-2026-03-15": test_programs::p3::wasi::cli::types,
"wasi:clocks/monotonic-clock@0.3.0-rc-2026-03-15": test_programs::p3::wasi::clocks::monotonic_clock,
"wasi:clocks/system-clock@0.3.0-rc-2026-03-15": test_programs::p3::wasi::clocks::system_clock,
"wasi:clocks/types@0.3.0-rc-2026-03-15": test_programs::p3::wasi::clocks::types,
"wasi:http/types@0.3.0": test_programs::p3::wasi::http::types,
"wasi:http/client@0.3.0": test_programs::p3::wasi::http::client,
"wasi:random/random@0.3.0": test_programs::p3::wasi::random::random,
"wasi:random/insecure@0.3.0": test_programs::p3::wasi::random::insecure,
"wasi:random/insecure-seed@0.3.0": test_programs::p3::wasi::random::insecure_seed,
"wasi:cli/stdout@0.3.0": test_programs::p3::wasi::cli::stdout,
"wasi:cli/stderr@0.3.0": test_programs::p3::wasi::cli::stderr,
"wasi:cli/stdin@0.3.0": test_programs::p3::wasi::cli::stdin,
"wasi:cli/types@0.3.0": test_programs::p3::wasi::cli::types,
"wasi:clocks/monotonic-clock@0.3.0": test_programs::p3::wasi::clocks::monotonic_clock,
"wasi:clocks/system-clock@0.3.0": test_programs::p3::wasi::clocks::system_clock,
"wasi:clocks/types@0.3.0": test_programs::p3::wasi::clocks::types,
},
});

Expand Down
2 changes: 1 addition & 1 deletion crates/test-programs/src/bin/p3_sockets_tcp_busy_poll.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ use test_programs::p3::wit_stream;
use test_programs::sockets::supports_ipv6;
use wit_bindgen::StreamResult;

#[link(wasm_import_module = "wasi:http/types@0.3.0-rc-2026-03-15")]
#[link(wasm_import_module = "wasi:http/types@0.3.0")]
unsafe extern "C" {
#[link_name = "[async-lower][stream-read-0][static]request.new"]
fn stream_read(_: u32, _: *mut u8, _: usize) -> u32;
Expand Down
36 changes: 18 additions & 18 deletions crates/test-programs/src/p3/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ wit_bindgen::generate!({
package wasmtime:test;

world testp3 {
include wasi:cli/imports@0.3.0-rc-2026-03-15;
include wasi:cli/imports@0.3.0;
include wasi:tls/imports@0.3.0-draft;
import wasi:http/types@0.3.0-rc-2026-03-15;
import wasi:http/client@0.3.0-rc-2026-03-15;
import wasi:http/handler@0.3.0-rc-2026-03-15;
import wasi:http/types@0.3.0;
import wasi:http/client@0.3.0;
import wasi:http/handler@0.3.0;

export wasi:cli/run@0.3.0-rc-2026-03-15;
export wasi:cli/run@0.3.0;
}
",
path: [
Expand All @@ -32,19 +32,19 @@ pub mod service {
default_bindings_module: "test_programs::p3::service",
pub_export_macro: true,
with: {
"wasi:http/handler@0.3.0-rc-2026-03-15": crate::p3::wasi::http::handler,
"wasi:http/types@0.3.0-rc-2026-03-15": crate::p3::wasi::http::types,
"wasi:http/client@0.3.0-rc-2026-03-15": crate::p3::wasi::http::client,
"wasi:random/random@0.3.0-rc-2026-03-15": crate::p3::wasi::random::random,
"wasi:random/insecure@0.3.0-rc-2026-03-15": crate::p3::wasi::random::insecure,
"wasi:random/insecure-seed@0.3.0-rc-2026-03-15": crate::p3::wasi::random::insecure_seed,
"wasi:cli/stdout@0.3.0-rc-2026-03-15": crate::p3::wasi::cli::stdout,
"wasi:cli/stderr@0.3.0-rc-2026-03-15": crate::p3::wasi::cli::stderr,
"wasi:cli/stdin@0.3.0-rc-2026-03-15": crate::p3::wasi::cli::stdin,
"wasi:cli/types@0.3.0-rc-2026-03-15": crate::p3::wasi::cli::types,
"wasi:clocks/monotonic-clock@0.3.0-rc-2026-03-15": crate::p3::wasi::clocks::monotonic_clock,
"wasi:clocks/system-clock@0.3.0-rc-2026-03-15": crate::p3::wasi::clocks::system_clock,
"wasi:clocks/types@0.3.0-rc-2026-03-15": crate::p3::wasi::clocks::types,
"wasi:http/handler@0.3.0": crate::p3::wasi::http::handler,
"wasi:http/types@0.3.0": crate::p3::wasi::http::types,
"wasi:http/client@0.3.0": crate::p3::wasi::http::client,
"wasi:random/random@0.3.0": crate::p3::wasi::random::random,
"wasi:random/insecure@0.3.0": crate::p3::wasi::random::insecure,
"wasi:random/insecure-seed@0.3.0": crate::p3::wasi::random::insecure_seed,
"wasi:cli/stdout@0.3.0": crate::p3::wasi::cli::stdout,
"wasi:cli/stderr@0.3.0": crate::p3::wasi::cli::stderr,
"wasi:cli/stdin@0.3.0": crate::p3::wasi::cli::stdin,
"wasi:cli/types@0.3.0": crate::p3::wasi::cli::types,
"wasi:clocks/monotonic-clock@0.3.0": crate::p3::wasi::clocks::monotonic_clock,
"wasi:clocks/system-clock@0.3.0": crate::p3::wasi::clocks::system_clock,
"wasi:clocks/types@0.3.0": crate::p3::wasi::clocks::types,
},
});
}
Expand Down
Loading
Loading