From f3cf39f3bebf5bbbe5be5631fb56332f16805c57 Mon Sep 17 00:00:00 2001
From: Ralf Jung <post@ralfj.de>
Date: Tue, 14 Jan 2025 17:10:56 +0100
Subject: wasi/io: remove dead files

---
 library/std/src/os/wasi/io/fd.rs       |  9 ---------
 library/std/src/os/wasi/io/fd/tests.rs | 11 -----------
 library/std/src/os/wasi/io/mod.rs      |  4 ++++
 library/std/src/os/wasi/io/raw.rs      | 20 --------------------
 library/std/src/os/wasi/io/tests.rs    | 11 +++++++++++
 5 files changed, 15 insertions(+), 40 deletions(-)
 delete mode 100644 library/std/src/os/wasi/io/fd.rs
 delete mode 100644 library/std/src/os/wasi/io/fd/tests.rs
 delete mode 100644 library/std/src/os/wasi/io/raw.rs
 create mode 100644 library/std/src/os/wasi/io/tests.rs

(limited to 'library/std/src')

diff --git a/library/std/src/os/wasi/io/fd.rs b/library/std/src/os/wasi/io/fd.rs
deleted file mode 100644
index 930aca887e3..00000000000
--- a/library/std/src/os/wasi/io/fd.rs
+++ /dev/null
@@ -1,9 +0,0 @@
-//! Owned and borrowed file descriptors.
-
-#![unstable(feature = "wasi_ext", issue = "71213")]
-
-// Tests for this module
-#[cfg(test)]
-mod tests;
-
-pub use crate::os::fd::owned::*;
diff --git a/library/std/src/os/wasi/io/fd/tests.rs b/library/std/src/os/wasi/io/fd/tests.rs
deleted file mode 100644
index 418274752b0..00000000000
--- a/library/std/src/os/wasi/io/fd/tests.rs
+++ /dev/null
@@ -1,11 +0,0 @@
-use crate::mem::size_of;
-use crate::os::wasi::io::RawFd;
-
-#[test]
-fn test_raw_fd_layout() {
-    // `OwnedFd` and `BorrowedFd` use `rustc_layout_scalar_valid_range_start`
-    // and `rustc_layout_scalar_valid_range_end`, with values that depend on
-    // the bit width of `RawFd`. If this ever changes, those values will need
-    // to be updated.
-    assert_eq!(size_of::<RawFd>(), 4);
-}
diff --git a/library/std/src/os/wasi/io/mod.rs b/library/std/src/os/wasi/io/mod.rs
index 4e123a1eec8..5f9a735db08 100644
--- a/library/std/src/os/wasi/io/mod.rs
+++ b/library/std/src/os/wasi/io/mod.rs
@@ -4,3 +4,7 @@
 
 #[stable(feature = "io_safety_wasi", since = "1.65.0")]
 pub use crate::os::fd::*;
+
+// Tests for this module
+#[cfg(test)]
+mod tests;
diff --git a/library/std/src/os/wasi/io/raw.rs b/library/std/src/os/wasi/io/raw.rs
deleted file mode 100644
index da3b36adad4..00000000000
--- a/library/std/src/os/wasi/io/raw.rs
+++ /dev/null
@@ -1,20 +0,0 @@
-//! WASI-specific extensions to general I/O primitives.
-
-#![unstable(feature = "wasi_ext", issue = "71213")]
-
-// NOTE: despite the fact that this module is unstable,
-// stable Rust had the capability to access the stable
-// re-exported items from os::fd::raw through this
-// unstable module.
-// In PR #95956 the stability checker was changed to check
-// all path segments of an item rather than just the last,
-// which caused the aforementioned stable usage to regress
-// (see issue #99502).
-// As a result, the items in os::fd::raw were given the
-// rustc_allowed_through_unstable_modules attribute.
-// No regression tests were added to ensure this property,
-// as CI is not configured to test wasm32-wasi.
-// If this module is stabilized,
-// you may want to remove those attributes
-// (assuming no other unstable modules need them).
-pub use crate::os::fd::raw::*;
diff --git a/library/std/src/os/wasi/io/tests.rs b/library/std/src/os/wasi/io/tests.rs
new file mode 100644
index 00000000000..418274752b0
--- /dev/null
+++ b/library/std/src/os/wasi/io/tests.rs
@@ -0,0 +1,11 @@
+use crate::mem::size_of;
+use crate::os::wasi::io::RawFd;
+
+#[test]
+fn test_raw_fd_layout() {
+    // `OwnedFd` and `BorrowedFd` use `rustc_layout_scalar_valid_range_start`
+    // and `rustc_layout_scalar_valid_range_end`, with values that depend on
+    // the bit width of `RawFd`. If this ever changes, those values will need
+    // to be updated.
+    assert_eq!(size_of::<RawFd>(), 4);
+}
-- 
cgit 1.4.1-3-g733a5