From ffc20e48de64f73ea57b6b7c121e2b50de30097f Mon Sep 17 00:00:00 2001
From: Christiaan Dirkx <christiaan@dirkx.email>
Date: Thu, 4 Mar 2021 15:15:26 +0100
Subject: [PATCH] Move `std::sys::windows::ext` to `std::os::windows`

---
 library/std/src/os/mod.rs                           |  6 ++----
 .../std/src/{sys/windows/ext => os/windows}/ffi.rs  |  0
 .../std/src/{sys/windows/ext => os/windows}/fs.rs   |  0
 .../std/src/{sys/windows/ext => os/windows}/io.rs   |  0
 .../std/src/{sys/windows/ext => os/windows}/mod.rs  |  1 -
 .../src/{sys/windows/ext => os/windows}/process.rs  |  0
 .../std/src/{sys/windows/ext => os/windows}/raw.rs  |  0
 .../src/{sys/windows/ext => os/windows}/thread.rs   |  0
 library/std/src/sys/mod.rs                          | 13 +++----------
 library/std/src/sys/windows/mod.rs                  |  1 -
 10 files changed, 5 insertions(+), 16 deletions(-)
 rename library/std/src/{sys/windows/ext => os/windows}/ffi.rs (100%)
 rename library/std/src/{sys/windows/ext => os/windows}/fs.rs (100%)
 rename library/std/src/{sys/windows/ext => os/windows}/io.rs (100%)
 rename library/std/src/{sys/windows/ext => os/windows}/mod.rs (98%)
 rename library/std/src/{sys/windows/ext => os/windows}/process.rs (100%)
 rename library/std/src/{sys/windows/ext => os/windows}/raw.rs (100%)
 rename library/std/src/{sys/windows/ext => os/windows}/thread.rs (100%)

diff --git a/library/std/src/os/mod.rs b/library/std/src/os/mod.rs
index fc684f0912f..85ffe8adb1f 100644
--- a/library/std/src/os/mod.rs
+++ b/library/std/src/os/mod.rs
@@ -23,8 +23,7 @@ cfg_if::cfg_if! {
         #[stable(feature = "wasi_ext_doc", since = "1.35.0")]
         pub use crate::sys::wasi_ext as wasi;
 
-        #[stable(feature = "rust1", since = "1.0.0")]
-        pub use crate::sys::windows_ext as windows;
+        pub mod windows;
     } else if #[cfg(doc)] {
         // On certain platforms right now the "main modules" modules that are
         // documented don't compile (missing things in `libc` which is empty),
@@ -94,7 +93,6 @@ cfg_if::cfg_if! {
         pub mod wasi;
 
         #[cfg(windows)]
-        #[stable(feature = "rust1", since = "1.0.0")]
-        pub use crate::sys::ext as windows;
+        pub mod windows;
     }
 }
diff --git a/library/std/src/sys/windows/ext/ffi.rs b/library/std/src/os/windows/ffi.rs
similarity index 100%
rename from library/std/src/sys/windows/ext/ffi.rs
rename to library/std/src/os/windows/ffi.rs
diff --git a/library/std/src/sys/windows/ext/fs.rs b/library/std/src/os/windows/fs.rs
similarity index 100%
rename from library/std/src/sys/windows/ext/fs.rs
rename to library/std/src/os/windows/fs.rs
diff --git a/library/std/src/sys/windows/ext/io.rs b/library/std/src/os/windows/io.rs
similarity index 100%
rename from library/std/src/sys/windows/ext/io.rs
rename to library/std/src/os/windows/io.rs
diff --git a/library/std/src/sys/windows/ext/mod.rs b/library/std/src/os/windows/mod.rs
similarity index 98%
rename from library/std/src/sys/windows/ext/mod.rs
rename to library/std/src/os/windows/mod.rs
index 613d3dc189a..52ac508f9f7 100644
--- a/library/std/src/sys/windows/ext/mod.rs
+++ b/library/std/src/os/windows/mod.rs
@@ -8,7 +8,6 @@
 
 #![stable(feature = "rust1", since = "1.0.0")]
 #![doc(cfg(windows))]
-#![allow(missing_docs)]
 
 pub mod ffi;
 pub mod fs;
diff --git a/library/std/src/sys/windows/ext/process.rs b/library/std/src/os/windows/process.rs
similarity index 100%
rename from library/std/src/sys/windows/ext/process.rs
rename to library/std/src/os/windows/process.rs
diff --git a/library/std/src/sys/windows/ext/raw.rs b/library/std/src/os/windows/raw.rs
similarity index 100%
rename from library/std/src/sys/windows/ext/raw.rs
rename to library/std/src/os/windows/raw.rs
diff --git a/library/std/src/sys/windows/ext/thread.rs b/library/std/src/os/windows/thread.rs
similarity index 100%
rename from library/std/src/sys/windows/ext/thread.rs
rename to library/std/src/os/windows/thread.rs
diff --git a/library/std/src/sys/mod.rs b/library/std/src/sys/mod.rs
index 33e68d12b0a..6b38f62dfe5 100644
--- a/library/std/src/sys/mod.rs
+++ b/library/std/src/sys/mod.rs
@@ -78,23 +78,16 @@ cfg_if::cfg_if! {
     all(target_vendor = "fortanix", target_env = "sgx")
 )))]
 cfg_if::cfg_if! {
-    if #[cfg(windows)] {
-        #[allow(missing_docs)]
-        #[stable(feature = "rust1", since = "1.0.0")]
-        pub use self::ext as windows_ext;
-    } else {
+    if #[cfg(not(windows))] {
         // On non-Windows platforms (aka linux/osx/etc) pull in a "minimal"
         // amount of windows goop which ends up compiling
 
         #[macro_use]
         #[path = "windows/compat.rs"]
-        mod compat;
+        pub mod compat;
 
         #[path = "windows/c.rs"]
-        mod c;
-
-        #[path = "windows/ext/mod.rs"]
-        pub mod windows_ext;
+        pub mod c;
     }
 }
 
diff --git a/library/std/src/sys/windows/mod.rs b/library/std/src/sys/windows/mod.rs
index 2208ff025c0..cc60ca375ea 100644
--- a/library/std/src/sys/windows/mod.rs
+++ b/library/std/src/sys/windows/mod.rs
@@ -18,7 +18,6 @@ pub mod c;
 pub mod cmath;
 pub mod condvar;
 pub mod env;
-pub mod ext;
 pub mod fs;
 pub mod handle;
 pub mod io;