Make os::wasi unstable in preview2 target

Signed-off-by: Ryan Levick <me@ryanlevick.com>

Author: rylev

compiler/rustc_span/src/symbol.rs

@@ -1787,6 +1787,7 @@ symbols! {
         warn,
         wasm_abi,
         wasm_import_module,
+        wasm_preview2,
         wasm_target_feature,
         while_let,
         windows,

library/std/Cargo.toml

@@ -50,7 +50,7 @@ fortanix-sgx-abi = { version = "0.5.0", features = ['rustc-dep-of-std'], public
 [target.'cfg(target_os = "hermit")'.dependencies]
 hermit-abi = { version = "0.3.2", features = ['rustc-dep-of-std'], public = true }
 
-[target.'cfg(any(target_os = "wasi", target_os = "wasi-preview2"))'.dependencies]
+[target.'cfg(target_family = "wasi")'.dependencies]
 wasi = { version = "0.11.0", features = ['rustc-dep-of-std'], default-features = false }
 
 [target.'cfg(target_os = "uefi")'.dependencies]

library/std/src/os/fd/raw.rs

@@ -12,7 +12,7 @@ use crate::os::raw;
 use crate::os::unix::io::AsFd;
 #[cfg(unix)]
 use crate::os::unix::io::OwnedFd;
-#[cfg(any(target_os = "wasi", target_os = "wasi-preview2"))]
+#[cfg(target_family = "wasi")]
 use crate::os::wasi::io::OwnedFd;
 use crate::sys_common::{AsInner, IntoInner};
 #[cfg(target_os = "hermit")]

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

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