From 90e11a2a58ce1565786f6aff7bbdf3f314c6b458 Mon Sep 17 00:00:00 2001
From: Gus Caplan <me@gus.host>
Date: Sun, 5 Mar 2023 18:21:07 -0800
Subject: [PATCH] move personality to sys

---
 library/std/src/lib.rs                                     | 1 -
 library/std/src/sys/mod.rs                                 | 1 +
 library/std/src/{ => sys}/personality/dwarf/eh.rs          | 0
 library/std/src/{ => sys}/personality/dwarf/mod.rs         | 0
 library/std/src/{ => sys}/personality/dwarf/tests.rs       | 0
 library/std/src/{ => sys}/personality/emcc.rs              | 0
 library/std/src/{ => sys}/personality/gcc.rs               | 0
 library/std/src/{personality.rs => sys/personality/mod.rs} | 0
 src/tools/tidy/src/pal.rs                                  | 2 --
 9 files changed, 1 insertion(+), 3 deletions(-)
 rename library/std/src/{ => sys}/personality/dwarf/eh.rs (100%)
 rename library/std/src/{ => sys}/personality/dwarf/mod.rs (100%)
 rename library/std/src/{ => sys}/personality/dwarf/tests.rs (100%)
 rename library/std/src/{ => sys}/personality/emcc.rs (100%)
 rename library/std/src/{ => sys}/personality/gcc.rs (100%)
 rename library/std/src/{personality.rs => sys/personality/mod.rs} (100%)

diff --git a/library/std/src/lib.rs b/library/std/src/lib.rs
index 72b9ad3480b..d287397aab3 100644
--- a/library/std/src/lib.rs
+++ b/library/std/src/lib.rs
@@ -603,7 +603,6 @@ pub mod arch {
 
 // Private support modules
 mod panicking;
-mod personality;
 
 #[path = "../../backtrace/src/lib.rs"]
 #[allow(dead_code, unused_attributes, fuzzy_provenance_casts)]
diff --git a/library/std/src/sys/mod.rs b/library/std/src/sys/mod.rs
index c72be13804d..99a7b0d826a 100644
--- a/library/std/src/sys/mod.rs
+++ b/library/std/src/sys/mod.rs
@@ -23,6 +23,7 @@
 #![allow(missing_debug_implementations)]
 
 pub mod common;
+mod personality;
 
 cfg_if::cfg_if! {
     if #[cfg(unix)] {
diff --git a/library/std/src/personality/dwarf/eh.rs b/library/std/src/sys/personality/dwarf/eh.rs
similarity index 100%
rename from library/std/src/personality/dwarf/eh.rs
rename to library/std/src/sys/personality/dwarf/eh.rs
diff --git a/library/std/src/personality/dwarf/mod.rs b/library/std/src/sys/personality/dwarf/mod.rs
similarity index 100%
rename from library/std/src/personality/dwarf/mod.rs
rename to library/std/src/sys/personality/dwarf/mod.rs
diff --git a/library/std/src/personality/dwarf/tests.rs b/library/std/src/sys/personality/dwarf/tests.rs
similarity index 100%
rename from library/std/src/personality/dwarf/tests.rs
rename to library/std/src/sys/personality/dwarf/tests.rs
diff --git a/library/std/src/personality/emcc.rs b/library/std/src/sys/personality/emcc.rs
similarity index 100%
rename from library/std/src/personality/emcc.rs
rename to library/std/src/sys/personality/emcc.rs
diff --git a/library/std/src/personality/gcc.rs b/library/std/src/sys/personality/gcc.rs
similarity index 100%
rename from library/std/src/personality/gcc.rs
rename to library/std/src/sys/personality/gcc.rs
diff --git a/library/std/src/personality.rs b/library/std/src/sys/personality/mod.rs
similarity index 100%
rename from library/std/src/personality.rs
rename to library/std/src/sys/personality/mod.rs
diff --git a/src/tools/tidy/src/pal.rs b/src/tools/tidy/src/pal.rs
index 6fd41e83362..5009b233542 100644
--- a/src/tools/tidy/src/pal.rs
+++ b/src/tools/tidy/src/pal.rs
@@ -58,8 +58,6 @@
     "library/std/src/path.rs",
     "library/std/src/sys_common", // Should only contain abstractions over platforms
     "library/std/src/net/test.rs", // Utility helpers for tests
-    "library/std/src/personality.rs",
-    "library/std/src/personality/",
 ];
 
 pub fn check(path: &Path, bad: &mut bool) {