Auto merge of #108796 - devsnek:personality-pal-exception, r=workingj…

…ubilee move personality to sys this moves `personality` to sys, removing another PAL exception
rust-lang · Jul 10, 2023 · 743333f · 743333f
2 parents 71f71a5 + 90e11a2
commit 743333f
Show file tree

Hide file tree

Showing 9 changed files with 1 addition and 3 deletions.
diff --git a/library/std/src/lib.rs b/library/std/src/lib.rs
@@ -603,7 +603,6 @@ pub mod alloc;
 
 // 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
@@ -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 → library/std/src/sys/personality/dwarf/eh.rs b/library/std/src/personality/dwarf/eh.rs → library/std/src/sys/personality/dwarf/eh.rs
diff --git a/library/std/src/personality/dwarf/mod.rs → library/std/src/sys/personality/dwarf/mod.rs b/library/std/src/personality/dwarf/mod.rs → library/std/src/sys/personality/dwarf/mod.rs
diff --git a/library/std/src/personality/dwarf/tests.rs → ...ry/std/src/sys/personality/dwarf/tests.rs b/library/std/src/personality/dwarf/tests.rs → ...ry/std/src/sys/personality/dwarf/tests.rs
diff --git a/library/std/src/personality/emcc.rs → library/std/src/sys/personality/emcc.rs b/library/std/src/personality/emcc.rs → library/std/src/sys/personality/emcc.rs
diff --git a/library/std/src/personality/gcc.rs → library/std/src/sys/personality/gcc.rs b/library/std/src/personality/gcc.rs → library/std/src/sys/personality/gcc.rs
diff --git a/library/std/src/personality.rs → library/std/src/sys/personality/mod.rs b/library/std/src/personality.rs → library/std/src/sys/personality/mod.rs
diff --git a/src/tools/tidy/src/pal.rs b/src/tools/tidy/src/pal.rs
@@ -56,8 +56,6 @@ const EXCEPTION_PATHS: &[&str] = &[
     "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) {