Rollup merge of #147205 - alexcrichton:wasip3, r=davidtwco

Add a new `wasm32-wasip3` target to Rust This commit adds a new tier 3 target to rustc, `wasm32-wasip3`. This follows in the footsteps of the previous `wasm32-wasip2` target and is used to represent binding to the WASIp3 set of APIs managed by the WASI subgroup to the WebAssembly Community Group. As of now the WASIp3 set of APIs are not finalized nor standardized. They're in the process of doing so and the current trajectory is to have the APIs published in December of this year. The goal here is to get the wheels turning in Rust to have the target in a more-ready-than-nonexistent state by the time this happens in December. For now the `wasm32-wasip3` target looks exactly the same as `wasm32-wasip2` except that `target_env = "p3"` is specified. This indicates to crates in the ecosystem that WASIp3 APIs should be used, such as the [`wasip3` crate]. Over time this target will evolve as implementation in guest toolchains progress, notably: * The standard library will use WASIp3 APIs natively once they're finalized in the WASI subgroup. * Support through `wasi-libc` will be updated to use WASIp3 natively which Rust will then transitively use. * Longer-term, features such as cooperative multithreading will be added to the WASIp3-track of targets to enable using `std::thread`, for example, on this target. These changes are all expected to be non-breaking changes for users of this target. Runtimes supporting WASIp3, currently Wasmtime and Jco, support WASIp2 APIs as well and will work with components whether or not they import WASIp2, both WASIp2 and WASIp3, or just WASIp3 APIs. This means that changing the internal implementation details of libstd over time is expected to be a non-breaking change. [`wasip3` crate]: https://crates.io/crates/wasip3

Author: matthiaskrgr

compiler/rustc_target/src/spec/mod.rs

@@ -1624,6 +1624,7 @@ supported_targets! {
  ("wasm32v1-none", wasm32v1_none),
  ("wasm32-wasip1", wasm32_wasip1),
  ("wasm32-wasip2", wasm32_wasip2),
+ ("wasm32-wasip3", wasm32_wasip3),
  ("wasm32-wasip1-threads", wasm32_wasip1_threads),
  ("wasm32-wali-linux-musl", wasm32_wali_linux_musl),
  ("wasm64-unknown-unknown", wasm64_unknown_unknown),

compiler/rustc_target/src/spec/targets/wasm32_wasip3.rs

@@ -0,0 +1,20 @@
+//! The `wasm32-wasip3` target is the next in the chain of `wasm32-wasip1`, then
+//! `wasm32-wasip2`, then WASIp3. The main feature of WASIp3 is native async
+//! support in the component model itself.
+//!
+//! Like `wasm32-wasip2` this target produces a component by default. Support
+//! for `wasm32-wasip3` is very early as of the time of this writing so
+//! components produced will still import WASIp2 APIs, but that's ok since it's
+//! all component-model-level imports anyway. Over time the imports of the
+//! standard library will change to WASIp3.
+
+use crate::spec::Target;
+
+pub(crate) fn target() -> Target {
+ // As of now WASIp3 is a lightly edited wasip2 target, so start with that
+ // and this may grow over time as more features are supported.
+ let mut target = super::wasm32_wasip2::target();
+ target.llvm_target = "wasm32-wasip3".into();
+ target.options.env = "p3".into();
+ target
+}

library/std/Cargo.toml

@@ -85,6 +85,11 @@ wasip2 = { version = '0.14.4', features = [
  'rustc-dep-of-std',
 ], default-features = false, package = 'wasi' }
 
+[target.'cfg(all(target_os = "wasi", target_env = "p3"))'.dependencies]
+wasip2 = { version = '0.14.4', features = [
+ 'rustc-dep-of-std',
+], default-features = false, package = 'wasi' }
+
 [target.'cfg(target_os = "uefi")'.dependencies]
 r-efi = { version = "5.2.0", features = ['rustc-dep-of-std'] }
 r-efi-alloc = { version = "2.0.0", features = ['rustc-dep-of-std'] }

library/std/src/os/mod.rs

@@ -103,7 +103,7 @@ pub mod linux;
  all(target_vendor = "fortanix", target_env = "sgx")
  )
 )))]
-#[cfg(any(target_os = "wasi", doc))]
+#[cfg(any(target_os = "wasi", any(target_env = "p1", target_env = "p2"), doc))]
 pub mod wasi;
 
 #[cfg(any(all(target_os = "wasi", target_env = "p2"), doc))]

library/std/src/sys/args/mod.rs

@@ -36,7 +36,7 @@ cfg_select! {
  mod wasip1;
  pub use wasip1::*;
  }
- all(target_os = "wasi", target_env = "p2") => {
+ all(target_os = "wasi", any(target_env = "p2", target_env = "p3")) => {
  mod wasip2;
  pub use wasip2::*;
  }

library/std/src/sys/net/connection/mod.rs

@@ -3,7 +3,7 @@ cfg_select! {
  all(target_family = "unix", not(target_os = "l4re")),
  target_os = "windows",
  target_os = "hermit",
- all(target_os = "wasi", target_env = "p2"),
+ all(target_os = "wasi", any(target_env = "p2", target_env = "p3")),
  target_os = "solid_asp3",
  ) => {
  mod socket;

library/std/src/sys/net/connection/socket/mod.rs

@@ -26,7 +26,7 @@ cfg_select! {
  mod unix;
  pub use unix::*;
  }
- all(target_os = "wasi", target_env = "p2") => {
+ all(target_os = "wasi", any(target_env = "p2", target_env = "p3")) => {
  mod wasip2;
  pub use wasip2::*;
  }

library/std/src/sys/pal/mod.rs

@@ -49,7 +49,7 @@ cfg_select! {
  mod vexos;
  pub use self::vexos::*;
  }
- all(target_os = "wasi", target_env = "p2") => {
+ all(target_os = "wasi", any(target_env = "p2", target_env = "p3")) => {
  mod wasip2;
  pub use self::wasip2::*;
  }

library/std/src/sys/random/mod.rs

@@ -90,7 +90,7 @@ cfg_select! {
  mod wasip1;
  pub use wasip1::fill_bytes;
  }
- all(target_os = "wasi", target_env = "p2") => {
+ all(target_os = "wasi", any(target_env = "p2", target_env = "p3")) => {
  mod wasip2;
  pub use wasip2::{fill_bytes, hashmap_random_keys};
  }
@@ -115,7 +115,7 @@ cfg_select! {
  target_os = "linux",
  target_os = "android",
  all(target_family = "wasm", target_os = "unknown"),
- all(target_os = "wasi", target_env = "p2"),
+ all(target_os = "wasi", not(target_env = "p1")),
  target_os = "xous",
  target_os = "vexos",
 )))]

library/std/src/sys/stdio/mod.rs

@@ -37,7 +37,7 @@ cfg_select! {
  mod wasip1;
  pub use wasip1::*;
  }
- all(target_os = "wasi", target_env = "p2") => {
+ all(target_os = "wasi", any(target_env = "p2", target_env = "p3")) => {
  mod wasip2;
  pub use wasip2::*;
  }