Skip to content
This repository was archived by the owner on Sep 8, 2025. It is now read-only.
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
10 changes: 5 additions & 5 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions crates/misc/component-async-tests/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ wasi-http-draft = { path = "http" }
wasm-compose = { workspace = true }
wasmparser = { workspace = true }
wasmtime = { workspace = true, features = [
"default",
"cranelift",
"component-model-async",
] }
Expand Down
2 changes: 1 addition & 1 deletion crates/test-programs/src/bin/async_post_return_caller.rs
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ struct Component;
impl Guest for Component {
async fn run() {
let s = "All mimsy were the borogoves";
assert_eq!(s, &foo(s).await);
assert_eq!(s, foo(s.to_string()).await);
assert_eq!(s, &get_post_return_value());
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ impl bindings::Guest for Component {
async fn foo(s: String) -> String {
format!(
"{} - exited guest",
bindings::foo(&format!("{s} - entered guest")).await
bindings::foo(format!("{s} - entered guest")).await
)
}
}
Expand Down
10 changes: 5 additions & 5 deletions crates/test-programs/src/bin/async_round_trip_many_stackless.rs
Original file line number Diff line number Diff line change
Expand Up @@ -45,13 +45,13 @@ impl Guest for Component {
c: v.c,
};
let (a, b, c, d, e, f, g) = many::foo(
&format!("{a} - entered guest"),
format!("{a} - entered guest"),
b,
&c,
c,
d,
&into(e),
f.map(into).as_ref(),
g.map(into).as_ref().map_err(drop),
into(e),
f.map(into),
g.map(into).map_err(drop),
)
.await;
(
Expand Down
10 changes: 5 additions & 5 deletions crates/test-programs/src/bin/async_round_trip_many_wait.rs
Original file line number Diff line number Diff line change
Expand Up @@ -53,13 +53,13 @@ impl Guest for Component {
};
async_support::block_on(async move {
let (a, b, c, d, e, f, g) = many::foo(
&format!("{a} - entered guest"),
format!("{a} - entered guest"),
b,
&c,
c,
d,
&into(e),
f.map(into).as_ref(),
g.map(into).as_ref().map_err(drop),
into(e),
f.map(into),
g.map(into).map_err(drop),
)
.await;
(
Expand Down
2 changes: 1 addition & 1 deletion crates/test-programs/src/bin/async_round_trip_stackless.rs
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ impl Baz for Component {
async fn foo(s: String) -> String {
format!(
"{} - exited guest",
baz::foo(&format!("{s} - entered guest")).await
baz::foo(format!("{s} - entered guest")).await
)
}
}
Expand Down
2 changes: 1 addition & 1 deletion crates/test-programs/src/bin/async_round_trip_wait.rs
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ impl Baz for Component {
async_support::block_on(async move {
format!(
"{} - exited guest",
baz::foo(&format!("{s} - entered guest")).await
baz::foo(format!("{s} - entered guest")).await
)
})
}
Expand Down
26 changes: 16 additions & 10 deletions crates/test-programs/src/bin/p3_sockets_ip_name_lookup.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,21 +7,25 @@ struct Component;
test_programs::p3::export!(Component);

async fn resolve_one(name: &str) -> Result<IpAddress, ErrorCode> {
Ok(resolve_addresses(name).await?.first().unwrap().to_owned())
Ok(resolve_addresses(name.into())
.await?
.first()
.unwrap()
.to_owned())
}

impl test_programs::p3::exports::wasi::cli::run::Guest for Component {
async fn run() -> Result<(), ()> {
// Valid domains
try_join!(
resolve_addresses("localhost"),
resolve_addresses("example.com")
resolve_addresses("localhost".into()),
resolve_addresses("example.com".into())
)
.unwrap();

// NB: this is an actual real resolution, so it might time out, might cause
// issues, etc. This result is ignored to prevent flaky failures in CI.
let _ = resolve_addresses("münchen.de").await;
let _ = resolve_addresses("münchen.de".into()).await;

// Valid IP addresses
assert_eq!(
Expand Down Expand Up @@ -64,27 +68,29 @@ impl test_programs::p3::exports::wasi::cli::run::Guest for Component {

// Invalid inputs
assert_eq!(
resolve_addresses("").await.unwrap_err(),
resolve_addresses("".into()).await.unwrap_err(),
ErrorCode::InvalidArgument
);
assert_eq!(
resolve_addresses(" ").await.unwrap_err(),
resolve_addresses(" ".into()).await.unwrap_err(),
ErrorCode::InvalidArgument
);
assert_eq!(
resolve_addresses("a.b<&>").await.unwrap_err(),
resolve_addresses("a.b<&>".into()).await.unwrap_err(),
ErrorCode::InvalidArgument
);
assert_eq!(
resolve_addresses("127.0.0.1:80").await.unwrap_err(),
resolve_addresses("127.0.0.1:80".into()).await.unwrap_err(),
ErrorCode::InvalidArgument
);
assert_eq!(
resolve_addresses("[::]:80").await.unwrap_err(),
resolve_addresses("[::]:80".into()).await.unwrap_err(),
ErrorCode::InvalidArgument
);
assert_eq!(
resolve_addresses("http://example.com/").await.unwrap_err(),
resolve_addresses("http://example.com/".into())
.await
.unwrap_err(),
ErrorCode::InvalidArgument
);
Ok(())
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,11 @@ async fn test_udp_sample_application(family: IpAddressFamily, bind_address: IpSo
let client_addr = client.local_address().unwrap();
join!(
async {
client.send(first_message, None).await.unwrap();
client.send(second_message, Some(addr)).await.unwrap();
client.send(first_message.to_vec(), None).await.unwrap();
client
.send(second_message.to_vec(), Some(addr))
.await
.unwrap();
},
async {
// Check that we've received our sent messages.
Expand All @@ -44,7 +47,10 @@ async fn test_udp_sample_application(family: IpAddressFamily, bind_address: IpSo
// Another client
let client = UdpSocket::new(family);
client.bind(unspecified_addr).unwrap();
client.send(third_message, Some(addr)).await.unwrap();
client
.send(third_message.to_vec(), Some(addr))
.await
.unwrap();
},
async {
// Check that we sent and received our message!
Expand Down
2 changes: 1 addition & 1 deletion crates/test-programs/src/bin/p3_sockets_udp_states.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ async fn test_udp_unbound_state_invariants(family: IpAddressFamily) {
// Skipping: udp::start_bind

assert_eq!(
sock.send(b"test", None).await,
sock.send(b"test".into(), None).await,
Err(ErrorCode::InvalidArgument)
);
assert_eq!(sock.disconnect(), Err(ErrorCode::InvalidState));
Expand Down