From cb052d57b36c554c4546765e25d377c2dbd5a77f Mon Sep 17 00:00:00 2001
From: joboet <jonasboettiger@icloud.com>
Date: Sat, 13 Jan 2024 18:30:44 +0100
Subject: [PATCH 1/2] std: move personality implementation out of PAL

---
 library/std/src/sys/mod.rs                               | 2 ++
 library/std/src/sys/pal/mod.rs                           | 1 -
 library/std/src/sys/{pal => }/personality/dwarf/eh.rs    | 0
 library/std/src/sys/{pal => }/personality/dwarf/mod.rs   | 0
 library/std/src/sys/{pal => }/personality/dwarf/tests.rs | 0
 library/std/src/sys/{pal => }/personality/emcc.rs        | 0
 library/std/src/sys/{pal => }/personality/gcc.rs         | 0
 library/std/src/sys/{pal => }/personality/mod.rs         | 0
 8 files changed, 2 insertions(+), 1 deletion(-)
 rename library/std/src/sys/{pal => }/personality/dwarf/eh.rs (100%)
 rename library/std/src/sys/{pal => }/personality/dwarf/mod.rs (100%)
 rename library/std/src/sys/{pal => }/personality/dwarf/tests.rs (100%)
 rename library/std/src/sys/{pal => }/personality/emcc.rs (100%)
 rename library/std/src/sys/{pal => }/personality/gcc.rs (100%)
 rename library/std/src/sys/{pal => }/personality/mod.rs (100%)

diff --git a/library/std/src/sys/mod.rs b/library/std/src/sys/mod.rs
index 0cd4528b69e15..bbdcb32606ccc 100644
--- a/library/std/src/sys/mod.rs
+++ b/library/std/src/sys/mod.rs
@@ -3,6 +3,8 @@
 /// descriptors.
 mod pal;
 
+mod personality;
+
 // FIXME(117276): remove this, move feature implementations into individual
 //                submodules.
 pub use pal::*;
diff --git a/library/std/src/sys/pal/mod.rs b/library/std/src/sys/pal/mod.rs
index 88420bd3612c8..66b2a4b888502 100644
--- a/library/std/src/sys/pal/mod.rs
+++ b/library/std/src/sys/pal/mod.rs
@@ -23,7 +23,6 @@
 #![allow(missing_debug_implementations)]
 
 pub mod common;
-mod personality;
 
 cfg_if::cfg_if! {
     if #[cfg(unix)] {
diff --git a/library/std/src/sys/pal/personality/dwarf/eh.rs b/library/std/src/sys/personality/dwarf/eh.rs
similarity index 100%
rename from library/std/src/sys/pal/personality/dwarf/eh.rs
rename to library/std/src/sys/personality/dwarf/eh.rs
diff --git a/library/std/src/sys/pal/personality/dwarf/mod.rs b/library/std/src/sys/personality/dwarf/mod.rs
similarity index 100%
rename from library/std/src/sys/pal/personality/dwarf/mod.rs
rename to library/std/src/sys/personality/dwarf/mod.rs
diff --git a/library/std/src/sys/pal/personality/dwarf/tests.rs b/library/std/src/sys/personality/dwarf/tests.rs
similarity index 100%
rename from library/std/src/sys/pal/personality/dwarf/tests.rs
rename to library/std/src/sys/personality/dwarf/tests.rs
diff --git a/library/std/src/sys/pal/personality/emcc.rs b/library/std/src/sys/personality/emcc.rs
similarity index 100%
rename from library/std/src/sys/pal/personality/emcc.rs
rename to library/std/src/sys/personality/emcc.rs
diff --git a/library/std/src/sys/pal/personality/gcc.rs b/library/std/src/sys/personality/gcc.rs
similarity index 100%
rename from library/std/src/sys/pal/personality/gcc.rs
rename to library/std/src/sys/personality/gcc.rs
diff --git a/library/std/src/sys/pal/personality/mod.rs b/library/std/src/sys/personality/mod.rs
similarity index 100%
rename from library/std/src/sys/pal/personality/mod.rs
rename to library/std/src/sys/personality/mod.rs

From b8d996c09e3aba782ac02334ac3ded7b74162d89 Mon Sep 17 00:00:00 2001
From: joboet <jonasboettiger@icloud.com>
Date: Sat, 13 Jan 2024 18:36:47 +0100
Subject: [PATCH 2/2] tidy: allow platform-dependent code in `sys`

---
 src/tools/tidy/src/pal.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/tools/tidy/src/pal.rs b/src/tools/tidy/src/pal.rs
index 398257d2bc271..7e5656926abe2 100644
--- a/src/tools/tidy/src/pal.rs
+++ b/src/tools/tidy/src/pal.rs
@@ -46,8 +46,8 @@ const EXCEPTION_PATHS: &[&str] = &[
     // we must use `#[cfg(windows)]` to conditionally compile the
     // correct `VaList` structure for windows.
     "library/core/src/ffi/mod.rs",
-    "library/std/src/sys/pal/", // Platform-specific code for std lives here.
-    "library/std/src/os",       // Platform-specific public interfaces
+    "library/std/src/sys", // Platform-specific code for std lives here.
+    "library/std/src/os",  // Platform-specific public interfaces
     // Temporary `std` exceptions
     // FIXME: platform-specific code should be moved to `sys`
     "library/std/src/io/copy.rs",