Add cfgs to distinguish WASIp3 and WASIp2 targets

.cargo/config.toml

@@ -3,3 +3,9 @@
 # * AWS auth environment variables, for running the wstd-aws integration tests.
 # * . directory is available at .
 runner = "wasmtime run -Shttp --env AWS_ACCESS_KEY_ID --env AWS_SECRET_ACCESS_KEY --env AWS_SESSION_TOKEN --dir .::."
+
+[target.wasm32-wasip3]
+# wasmtime is given:
+# * AWS auth environment variables, for running the wstd-aws integration tests.
+# * . directory is available at .
+runner = "wasmtime run -Shttp -Sp3 --env AWS_ACCESS_KEY_ID --env AWS_SECRET_ACCESS_KEY --env AWS_SESSION_TOKEN --dir .::."

.github/actions/install-rust/action.yml

@@ -29,7 +29,15 @@ runs:
       run: |
         rustup set profile minimal
         rustup update "${{ steps.select.outputs.version }}" --no-self-update
-        rustup default "${{ steps.select.outputs.version }}"
+        # `rustup default` gets overwritten by rust-toolchain.toml, `rustup
+        # override` has higher precedence though.
+        rustup override set "${{ steps.select.outputs.version }}"
+
+        rustup target add wasm32-wasip2
+
+        if [ "${{ inputs.toolchain }}" = "nightly" ]; then
+          rustup target add wasm32-wasip3
+        fi
 
         # Save disk space by avoiding incremental compilation. Also turn down
         # debuginfo from 2 to 0 to help save disk space.

.github/workflows/ci.yaml

@@ -48,12 +48,19 @@ jobs:
         role-to-assume: arn:aws:iam::313377415443:role/wstd-aws-ci-role
         role-session-name: github-ci
 
+    - name: rust version
+      run: cargo --version
+
     - name: check
       run: cargo check --workspace --all --bins --examples
 
-    - name: wstd tests
+    - name: wstd p2 tests
       run: cargo test -p wstd -p wstd-axum --target wasm32-wasip2 -- --nocapture
 
+    - name: wstd p3 tests
+      if: matrix.rust == 'nightly'
+      run: cargo test -p wstd -p wstd-axum --target wasm32-wasip3 -- --nocapture
+
     - name: test-programs tests
       run: cargo test -p test-programs -- --nocapture
       if: steps.creds.outcome == 'success'
@@ -90,4 +97,3 @@ jobs:
     - run: ./publish bump
     # Make sure the tree is publish-able as-is
     - run: ./publish verify
-

Cargo.toml

@@ -27,13 +27,18 @@ http.workspace = true
 itoa.workspace = true
 pin-project-lite.workspace = true
 slab.workspace = true
-wasip2.workspace = true
 wstd-macro.workspace = true
 
 # optional
 serde = { workspace = true, optional = true }
 serde_json = { workspace = true, optional = true }
 
+[target.'cfg(all(target_os = "wasi", target_env = "p2"))'.dependencies]
+wasip2.workspace = true
+
+[target.'cfg(all(target_os = "wasi", target_env = "p3"))'.dependencies]
+wasip3.workspace = true
+
 [dev-dependencies]
 anyhow.workspace = true
 clap.workspace = true
@@ -59,7 +64,7 @@ license = "Apache-2.0 WITH LLVM-exception"
 repository = "https://github.com/bytecodealliance/wstd"
 keywords = ["WebAssembly", "async", "stdlib", "Components"]
 categories = ["wasm", "asynchronous"]
-rust-version = "1.91.1"
+rust-version = "1.92.0"
 authors = [
     "Yoshua Wuyts <rust@yosh.is>",
     "Pat Hickey <pat@moreproductive.org>",
@@ -95,13 +100,13 @@ test-programs = { path = "test-programs" }
 tower-service = "0.3.3"
 ureq = { version = "3.1", default-features = false, features = ["json"] }
 wasip2 = "1.0"
-wstd = { path = ".", version = "=0.6.8" }
+wasip3 = "0.8"
+wstd = { path = ".", version = "=0.6.8", default-features = false }
 wstd-axum = { path = "./axum", version = "=0.6.8" }
 wstd-axum-macro = { path = "./axum/macro", version = "=0.6.8" }
 wstd-macro = { path = "./macro", version = "=0.6.8" }
 
 [package.metadata.docs.rs]
-all-features = true
 targets = [
     "wasm32-wasip2"
 ]

axum/Cargo.toml

@@ -13,7 +13,7 @@ rust-version.workspace = true
 [dependencies]
 axum.workspace = true
 tower-service.workspace = true
-wstd.workspace = true
+wstd = { workspace = true, features = ["json"] }
 wstd-axum-macro.workspace = true
 
 [dev-dependencies]

axum/examples/hello_world.rs

@@ -1,3 +1,6 @@
+#![cfg_attr(not(all(target_os = "wasi", target_env = "p2")), no_main)]
+#![cfg(all(target_os = "wasi", target_env = "p2"))]
+
 //! Run with
 //!
 //! ```sh

axum/examples/hello_world_nomacro.rs

@@ -1,3 +1,6 @@
+#![cfg_attr(not(all(target_os = "wasi", target_env = "p2")), no_main)]
+#![cfg(all(target_os = "wasi", target_env = "p2"))]
+
 //! Run with
 //!
 //! ```sh

axum/examples/weather.rs

@@ -1,3 +1,6 @@
+#![cfg_attr(not(all(target_os = "wasi", target_env = "p2")), no_main)]
+#![cfg(all(target_os = "wasi", target_env = "p2"))]
+
 //! This demo app shows a Axum based wasi-http server making an arbitrary
 //! number of http requests as part of serving a single response.
 //!

axum/src/lib.rs

@@ -1,3 +1,4 @@
+#![cfg(all(target_os = "wasi", target_env = "p2"))]
 //! Support for the [`axum`] web server framework in wasi-http components, via
 //! [`wstd`].
 //!

examples/complex_http_client.rs

@@ -1,3 +1,6 @@
+#![cfg_attr(not(all(target_os = "wasi", target_env = "p2")), no_main)]
+#![cfg(all(target_os = "wasi", target_env = "p2"))]
+
 use anyhow::{Result, anyhow};
 use clap::{ArgAction, Parser};
 use std::str::FromStr;

examples/http_client.rs

@@ -1,3 +1,6 @@
+#![cfg_attr(not(all(target_os = "wasi", target_env = "p2")), no_main)]
+#![cfg(all(target_os = "wasi", target_env = "p2"))]
+
 use anyhow::{Result, anyhow};
 use clap::{ArgAction, Parser};
 use wstd::http::{Body, BodyExt, Client, Method, Request, Uri};

examples/http_server.rs

@@ -1,3 +1,6 @@
+#![cfg_attr(not(all(target_os = "wasi", target_env = "p2")), no_main)]
+#![cfg(all(target_os = "wasi", target_env = "p2"))]
+
 use anyhow::{Context, Result};
 use futures_lite::stream::{once_future, unfold};
 use http_body_util::{BodyExt, StreamBody};

examples/http_server_proxy.rs

@@ -1,3 +1,6 @@
+#![cfg_attr(not(all(target_os = "wasi", target_env = "p2")), no_main)]
+#![cfg(all(target_os = "wasi", target_env = "p2"))]
+
 //! Run the example with:
 //! ```sh
 //! cargo build --example http_server_proxy --target=wasm32-wasip2

examples/tcp_echo_server.rs

@@ -1,3 +1,6 @@
+#![cfg_attr(not(all(target_os = "wasi", target_env = "p2")), no_main)]
+#![cfg(all(target_os = "wasi", target_env = "p2"))]
+
 use wstd::io;
 use wstd::iter::AsyncIterator;
 use wstd::net::TcpListener;

examples/tcp_stream_client.rs

@@ -1,3 +1,6 @@
+#![cfg_attr(not(all(target_os = "wasi", target_env = "p2")), no_main)]
+#![cfg(all(target_os = "wasi", target_env = "p2"))]
+
 use wstd::io::{self, AsyncRead, AsyncWrite};
 use wstd::net::TcpStream;
 

examples/udp_echo_server.rs

@@ -1,3 +1,6 @@
+#![cfg_attr(not(all(target_os = "wasi", target_env = "p2")), no_main)]
+#![cfg(all(target_os = "wasi", target_env = "p2"))]
+
 use wstd::io;
 use wstd::net::UdpSocket;
 

examples/udp_stream_client.rs

@@ -1,3 +1,6 @@
+#![cfg_attr(not(all(target_os = "wasi", target_env = "p2")), no_main)]
+#![cfg(all(target_os = "wasi", target_env = "p2"))]
+
 use wstd::io;
 use wstd::net::{UdpSocket, UdpStream};
 

src/lib.rs

@@ -55,30 +55,44 @@
 //! These are unique capabilities provided by WASI 0.2, and because this library
 //! is specific to that are exposed from here.
 
+#[cfg(all(target_os = "wasi", target_env = "p2"))]
 pub mod future;
+#[cfg(all(target_os = "wasi", target_env = "p2"))]
 #[macro_use]
 pub mod http;
+#[cfg(all(target_os = "wasi", target_env = "p2"))]
 pub mod io;
 pub mod iter;
+#[cfg(all(target_os = "wasi", target_env = "p2"))]
 pub mod net;
+#[cfg(all(target_os = "wasi", target_env = "p2"))]
 pub mod rand;
+#[cfg(all(target_os = "wasi", target_env = "p2"))]
 pub mod runtime;
+#[cfg(all(target_os = "wasi", target_env = "p2"))]
 pub mod task;
+#[cfg(all(target_os = "wasi", target_env = "p2"))]
 pub mod time;
 
-pub use wstd_macro::attr_macro_http_server as http_server;
-pub use wstd_macro::attr_macro_main as main;
-pub use wstd_macro::attr_macro_test as test;
+#[cfg(all(target_os = "wasi", target_env = "p2"))]
+pub use wstd_macro::{
+    attr_macro_http_server as http_server, attr_macro_main as main, attr_macro_test as test,
+};
 
-// Re-export the wasip2 crate for use only by `wstd-macro` macros. The proc
-// macros need to generate code that uses these definitions, but we don't want
-// to treat it as part of our public API with regards to semver, so we keep it
-// under `__internal` as well as doc(hidden) to indicate it is private.
+// Re-export the active WASI backend crate for use only by `wstd-macro` macros.
+// The proc macros need to generate code that uses these definitions, but we
+// don't want to treat it as part of our public API with regards to semver, so
+// we keep it under `__internal` as well as doc(hidden) to indicate it is
+// private.
 #[doc(hidden)]
 pub mod __internal {
+    #[cfg(all(target_os = "wasi", target_env = "p2"))]
     pub use wasip2;
+    #[cfg(all(target_os = "wasi", target_env = "p3"))]
+    pub use wasip3;
 }
 
+#[cfg(all(target_os = "wasi", target_env = "p2"))]
 pub mod prelude {
     pub use crate::future::FutureExt as _;
     pub use crate::io::AsyncRead as _;

tests/http_first_byte_timeout.rs

@@ -1,3 +1,5 @@
+#![cfg(all(target_os = "wasi", target_env = "p2"))]
+
 use wstd::http::{Body, Client, Request, error::ErrorCode};
 
 #[wstd::main]

tests/http_get.rs

@@ -1,3 +1,5 @@
+#![cfg(all(target_os = "wasi", target_env = "p2"))]
+
 use std::error::Error;
 use wstd::http::{Body, Client, HeaderValue, Request};
 

tests/http_get_json.rs

@@ -1,3 +1,5 @@
+#![cfg(all(target_os = "wasi", target_env = "p2"))]
+
 use serde::Deserialize;
 use std::error::Error;
 use wstd::http::{Body, Client, Request};

tests/http_handle_error_code.rs

@@ -1,3 +1,5 @@
+#![cfg(all(target_os = "wasi", target_env = "p2"))]
+
 use wstd::http::{Body, Client, Request, error::ErrorCode};
 
 /// Test that `outgoing_handler::handle` errors are properly propagated.

tests/http_post.rs

@@ -1,3 +1,5 @@
+#![cfg(all(target_os = "wasi", target_env = "p2"))]
+
 use std::error::Error;
 use wstd::http::{Client, HeaderValue, Request};
 

tests/http_post_json.rs

@@ -1,3 +1,5 @@
+#![cfg(all(target_os = "wasi", target_env = "p2"))]
+
 use serde::{Deserialize, Serialize};
 use std::error::Error;
 use wstd::http::{Body, Client, HeaderValue, Request};

tests/http_timeout.rs

@@ -1,3 +1,5 @@
+#![cfg(all(target_os = "wasi", target_env = "p2"))]
+
 use wstd::future::FutureExt;
 use wstd::http::{Body, Client, Request};
 use wstd::time::Duration;

tests/sleep.rs

@@ -1,3 +1,5 @@
+#![cfg(all(target_os = "wasi", target_env = "p2"))]
+
 use std::error::Error;
 use wstd::task::sleep;
 use wstd::time::Duration;