From 70b03645002e50fbe0c8ed29a0b0e801ace48a10 Mon Sep 17 00:00:00 2001
From: joboet <jonasboettiger@icloud.com>
Date: Mon, 15 Jan 2024 16:26:25 +0100
Subject: [PATCH] std: move OS String implementation into `sys`

---
 library/std/src/sys/mod.rs                           |  1 +
 .../src/sys/{pal/unix/os_str.rs => os_str/bytes.rs}  |  1 -
 .../sys/{pal/unix/os_str => os_str/bytes}/tests.rs   |  0
 library/std/src/sys/os_str/mod.rs                    | 12 ++++++++++++
 .../sys/{pal/windows/os_str.rs => os_str/wtf8.rs}    |  0
 library/std/src/sys/pal/hermit/mod.rs                |  2 --
 library/std/src/sys/pal/sgx/mod.rs                   |  2 --
 library/std/src/sys/pal/solid/mod.rs                 |  2 --
 library/std/src/sys/pal/teeos/mod.rs                 |  2 --
 library/std/src/sys/pal/uefi/mod.rs                  |  2 --
 library/std/src/sys/pal/unix/mod.rs                  |  1 -
 library/std/src/sys/pal/unsupported/mod.rs           |  2 --
 library/std/src/sys/pal/wasi/mod.rs                  |  2 --
 library/std/src/sys/pal/wasm/mod.rs                  |  2 --
 library/std/src/sys/pal/windows/mod.rs               |  1 -
 library/std/src/sys/pal/xous/mod.rs                  |  2 --
 16 files changed, 13 insertions(+), 21 deletions(-)
 rename library/std/src/sys/{pal/unix/os_str.rs => os_str/bytes.rs} (99%)
 rename library/std/src/sys/{pal/unix/os_str => os_str/bytes}/tests.rs (100%)
 create mode 100644 library/std/src/sys/os_str/mod.rs
 rename library/std/src/sys/{pal/windows/os_str.rs => os_str/wtf8.rs} (100%)

diff --git a/library/std/src/sys/mod.rs b/library/std/src/sys/mod.rs
index bbdcb32606ccc..d95c0d8d0628c 100644
--- a/library/std/src/sys/mod.rs
+++ b/library/std/src/sys/mod.rs
@@ -3,6 +3,7 @@
 /// descriptors.
 mod pal;
 
+pub mod os_str;
 mod personality;
 
 // FIXME(117276): remove this, move feature implementations into individual
diff --git a/library/std/src/sys/pal/unix/os_str.rs b/library/std/src/sys/os_str/bytes.rs
similarity index 99%
rename from library/std/src/sys/pal/unix/os_str.rs
rename to library/std/src/sys/os_str/bytes.rs
index 7bd2f656a24e5..3a75ce9ebb781 100644
--- a/library/std/src/sys/pal/unix/os_str.rs
+++ b/library/std/src/sys/os_str/bytes.rs
@@ -14,7 +14,6 @@ use crate::sys_common::{AsInner, IntoInner};
 use core::str::Utf8Chunks;
 
 #[cfg(test)]
-#[path = "../unix/os_str/tests.rs"]
 mod tests;
 
 #[derive(Hash)]
diff --git a/library/std/src/sys/pal/unix/os_str/tests.rs b/library/std/src/sys/os_str/bytes/tests.rs
similarity index 100%
rename from library/std/src/sys/pal/unix/os_str/tests.rs
rename to library/std/src/sys/os_str/bytes/tests.rs
diff --git a/library/std/src/sys/os_str/mod.rs b/library/std/src/sys/os_str/mod.rs
new file mode 100644
index 0000000000000..b509729475bf7
--- /dev/null
+++ b/library/std/src/sys/os_str/mod.rs
@@ -0,0 +1,12 @@
+cfg_if::cfg_if! {
+    if #[cfg(any(
+        target_os = "windows",
+        target_os = "uefi",
+    ))] {
+        mod wtf8;
+        pub use wtf8::{Buf, Slice};
+    } else {
+        mod bytes;
+        pub use bytes::{Buf, Slice};
+    }
+}
diff --git a/library/std/src/sys/pal/windows/os_str.rs b/library/std/src/sys/os_str/wtf8.rs
similarity index 100%
rename from library/std/src/sys/pal/windows/os_str.rs
rename to library/std/src/sys/os_str/wtf8.rs
diff --git a/library/std/src/sys/pal/hermit/mod.rs b/library/std/src/sys/pal/hermit/mod.rs
index 937603cfd8a0b..5033629691960 100644
--- a/library/std/src/sys/pal/hermit/mod.rs
+++ b/library/std/src/sys/pal/hermit/mod.rs
@@ -30,8 +30,6 @@ pub mod io;
 pub mod memchr;
 pub mod net;
 pub mod os;
-#[path = "../unix/os_str.rs"]
-pub mod os_str;
 #[path = "../unix/path.rs"]
 pub mod path;
 #[path = "../unsupported/pipe.rs"]
diff --git a/library/std/src/sys/pal/sgx/mod.rs b/library/std/src/sys/pal/sgx/mod.rs
index 09d3f7638ca2d..893c5f765a797 100644
--- a/library/std/src/sys/pal/sgx/mod.rs
+++ b/library/std/src/sys/pal/sgx/mod.rs
@@ -24,8 +24,6 @@ pub mod io;
 pub mod memchr;
 pub mod net;
 pub mod os;
-#[path = "../unix/os_str.rs"]
-pub mod os_str;
 pub mod path;
 #[path = "../unsupported/pipe.rs"]
 pub mod pipe;
diff --git a/library/std/src/sys/pal/solid/mod.rs b/library/std/src/sys/pal/solid/mod.rs
index 5af83653cf849..5742ce9d72c69 100644
--- a/library/std/src/sys/pal/solid/mod.rs
+++ b/library/std/src/sys/pal/solid/mod.rs
@@ -31,8 +31,6 @@ pub mod fs;
 pub mod io;
 pub mod net;
 pub mod os;
-#[path = "../unix/os_str.rs"]
-pub mod os_str;
 pub mod path;
 #[path = "../unsupported/pipe.rs"]
 pub mod pipe;
diff --git a/library/std/src/sys/pal/teeos/mod.rs b/library/std/src/sys/pal/teeos/mod.rs
index ed8c54b2c36fb..764a4e6ad35ea 100644
--- a/library/std/src/sys/pal/teeos/mod.rs
+++ b/library/std/src/sys/pal/teeos/mod.rs
@@ -27,8 +27,6 @@ pub mod net;
 #[path = "../unsupported/once.rs"]
 pub mod once;
 pub mod os;
-#[path = "../unix/os_str.rs"]
-pub mod os_str;
 #[path = "../unix/path.rs"]
 pub mod path;
 #[path = "../unsupported/pipe.rs"]
diff --git a/library/std/src/sys/pal/uefi/mod.rs b/library/std/src/sys/pal/uefi/mod.rs
index 4edc00e3ea022..fb1a531182a7f 100644
--- a/library/std/src/sys/pal/uefi/mod.rs
+++ b/library/std/src/sys/pal/uefi/mod.rs
@@ -28,8 +28,6 @@ pub mod net;
 #[path = "../unsupported/once.rs"]
 pub mod once;
 pub mod os;
-#[path = "../windows/os_str.rs"]
-pub mod os_str;
 pub mod path;
 #[path = "../unsupported/pipe.rs"]
 pub mod pipe;
diff --git a/library/std/src/sys/pal/unix/mod.rs b/library/std/src/sys/pal/unix/mod.rs
index b5da5f870ec12..86027c2b0b0af 100644
--- a/library/std/src/sys/pal/unix/mod.rs
+++ b/library/std/src/sys/pal/unix/mod.rs
@@ -29,7 +29,6 @@ pub mod net;
 #[cfg(target_os = "l4re")]
 pub use self::l4re::net;
 pub mod os;
-pub mod os_str;
 pub mod path;
 pub mod pipe;
 pub mod process;
diff --git a/library/std/src/sys/pal/unsupported/mod.rs b/library/std/src/sys/pal/unsupported/mod.rs
index e1a38de647116..6254c67a2a3b2 100644
--- a/library/std/src/sys/pal/unsupported/mod.rs
+++ b/library/std/src/sys/pal/unsupported/mod.rs
@@ -11,8 +11,6 @@ pub mod locks;
 pub mod net;
 pub mod once;
 pub mod os;
-#[path = "../unix/os_str.rs"]
-pub mod os_str;
 #[path = "../unix/path.rs"]
 pub mod path;
 pub mod pipe;
diff --git a/library/std/src/sys/pal/wasi/mod.rs b/library/std/src/sys/pal/wasi/mod.rs
index 5919cc506d921..c1fc053bf049a 100644
--- a/library/std/src/sys/pal/wasi/mod.rs
+++ b/library/std/src/sys/pal/wasi/mod.rs
@@ -32,8 +32,6 @@ pub mod io;
 
 pub mod net;
 pub mod os;
-#[path = "../unix/os_str.rs"]
-pub mod os_str;
 #[path = "../unix/path.rs"]
 pub mod path;
 #[path = "../unsupported/pipe.rs"]
diff --git a/library/std/src/sys/pal/wasm/mod.rs b/library/std/src/sys/pal/wasm/mod.rs
index 6c05b56e1bfc0..d2181565887ff 100644
--- a/library/std/src/sys/pal/wasm/mod.rs
+++ b/library/std/src/sys/pal/wasm/mod.rs
@@ -30,8 +30,6 @@ pub mod io;
 pub mod net;
 #[path = "../unsupported/os.rs"]
 pub mod os;
-#[path = "../unix/os_str.rs"]
-pub mod os_str;
 #[path = "../unix/path.rs"]
 pub mod path;
 #[path = "../unsupported/pipe.rs"]
diff --git a/library/std/src/sys/pal/windows/mod.rs b/library/std/src/sys/pal/windows/mod.rs
index 8b722f01a5d30..d097a7b8bb265 100644
--- a/library/std/src/sys/pal/windows/mod.rs
+++ b/library/std/src/sys/pal/windows/mod.rs
@@ -24,7 +24,6 @@ pub mod locks;
 pub mod memchr;
 pub mod net;
 pub mod os;
-pub mod os_str;
 pub mod path;
 pub mod pipe;
 pub mod process;
diff --git a/library/std/src/sys/pal/xous/mod.rs b/library/std/src/sys/pal/xous/mod.rs
index c2550dcfd8315..230067907c8f0 100644
--- a/library/std/src/sys/pal/xous/mod.rs
+++ b/library/std/src/sys/pal/xous/mod.rs
@@ -17,8 +17,6 @@ pub mod net;
 #[path = "../unsupported/once.rs"]
 pub mod once;
 pub mod os;
-#[path = "../unix/os_str.rs"]
-pub mod os_str;
 #[path = "../unix/path.rs"]
 pub mod path;
 #[path = "../unsupported/pipe.rs"]