Rename wasm32-wasi-preview2 to wasm32-wasip2

Signed-off-by: Ryan Levick <[email protected]>

Author: rylev

compiler/rustc_span/src/symbol.rs

@@ -1881,9 +1881,9 @@ symbols! {
         vtable_align,
         vtable_size,
         warn,
+        wasip2,
         wasm_abi,
         wasm_import_module,
-        wasm_preview2,
         wasm_target_feature,
         while_let,
         windows,

compiler/rustc_target/src/spec/mod.rs

@@ -1575,7 +1575,7 @@ supported_targets! {
     ("wasm32-unknown-emscripten", wasm32_unknown_emscripten),
     ("wasm32-unknown-unknown", wasm32_unknown_unknown),
     ("wasm32-wasi", wasm32_wasi),
-    ("wasm32-wasi-preview2", wasm32_wasi_preview2),
+    ("wasm32-wasip2", wasm32_wasip2),
     ("wasm32-wasi-preview1-threads", wasm32_wasi_preview1_threads),
     ("wasm64-unknown-unknown", wasm64_unknown_unknown),
 

compiler/rustc_target/src/spec/targets/wasm32_wasi_preview2.rs renamed to compiler/rustc_target/src/spec/targets/wasm32_wasip2.rs

@@ -1,4 +1,4 @@
-//! The `wasm32-wasi-preview2` target is the next evolution of the
+//! The `wasm32-wasip2` target is the next evolution of the
 //! wasm32-wasi target. While the wasi specification is still under
 //! active development, the {review 2 iteration is considered an "island
 //! of stability" that should allow users to rely on it indefinitely.
@@ -24,7 +24,7 @@ pub fn target() -> Target {
     let mut options = base::wasm::options();
 
     options.os = "wasi".into();
-    options.env = "preview2".into();
+    options.env = "p2".into();
     options.linker = Some("wasm-component-ld".into());
 
     options.pre_link_objects_self_contained = crt_objects::pre_wasi_self_contained();

library/std/src/os/mod.rs

@@ -85,8 +85,8 @@ pub mod linux;
 #[cfg(any(target_os = "wasi", doc))]
 pub mod wasi;
 
-#[cfg(any(all(target_os = "wasi", target_env = "preview2"), doc))]
-pub mod wasi_preview2;
+#[cfg(any(all(target_os = "wasi", target_env = "p2"), doc))]
+pub mod wasip2;
 
 // windows
 #[cfg(not(all(

library/std/src/os/wasi/mod.rs

@@ -28,8 +28,8 @@
 //! [`OsStr`]: crate::ffi::OsStr
 //! [`OsString`]: crate::ffi::OsString
 
-#![cfg_attr(not(target_env = "preview2"), stable(feature = "rust1", since = "1.0.0"))]
-#![cfg_attr(target_env = "preview2", unstable(feature = "wasm_preview2", issue = "none"))]
+#![cfg_attr(not(target_env = "p2"), stable(feature = "rust1", since = "1.0.0"))]
+#![cfg_attr(target_env = "p2", unstable(feature = "wasip2", issue = "none"))]
 #![deny(unsafe_op_in_unsafe_fn)]
 #![doc(cfg(target_os = "wasi"))]
 

library/std/src/os/wasi_preview2/mod.rs renamed to library/std/src/os/wasip2/mod.rs

@@ -40,9 +40,9 @@ cfg_if::cfg_if! {
     } else if #[cfg(target_os = "wasi")] {
         mod wasi;
         pub use self::wasi::*;
-    } else if #[cfg(all(target_os = "wasi", target_env = "preview2"))] {
-        mod wasi_preview2;
-        pub use self::wasi_preview2::*;
+    } else if #[cfg(all(target_os = "wasi", target_env = "p2"))] {
+        mod wasip2;
+        pub use self::wasip2::*;
     } else if #[cfg(target_family = "wasm")] {
         mod wasm;
         pub use self::wasm::*;

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

@@ -49,7 +49,7 @@ pub mod time;
 
 cfg_if::cfg_if! {
     if #[cfg(target_feature = "atomics")] {
-        compile_error!("The wasm32-wasi-preview2 target does not support atomics");
+        compile_error!("The wasm32-wasip2 target does not support atomics");
     } else {
         #[path = "../unsupported/locks/mod.rs"]
         pub mod locks;

library/std/src/sys/pal/wasi_preview2/mod.rs renamed to library/std/src/sys/pal/wasip2/mod.rs

@@ -404,7 +404,7 @@ fn copy_self_contained_objects(
                 )
             })
             .join("lib")
-            .join(target.to_string().replace("-preview1", "").replace("-preview2", ""));
+            .join(target.to_string().replace("-preview1", "").replace("p2", ""));
         for &obj in &["libc.a", "crt1-command.o", "crt1-reactor.o"] {
             copy_and_stamp(
                 builder,