Rollup merge of rust-lang#119935 - joboet:move_pal_personality, r=Chr…

…isDenton Move personality implementation out of PAL The module already follows the new convention described in rust-lang#117276. This PR also includes a small fix in the tidy pal check, that was just an oversight in rust-lang#117285.
matthiaskrgr · Jan 13, 2024 · 3a33a4b · 3a33a4b
2 parents 70bc26d + b8d996c
commit 3a33a4b
Show file tree

Hide file tree

Showing 9 changed files with 4 additions and 3 deletions.
diff --git 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
@@ -23,7 +23,6 @@
 #![allow(missing_debug_implementations)]
 
 pub mod common;
-mod personality;
 
 cfg_if::cfg_if! {
     if #[cfg(unix)] {

diff --git a/...y/std/src/sys/pal/personality/dwarf/eh.rs → library/std/src/sys/personality/dwarf/eh.rs b/...y/std/src/sys/pal/personality/dwarf/eh.rs → library/std/src/sys/personality/dwarf/eh.rs
diff --git a/.../std/src/sys/pal/personality/dwarf/mod.rs → library/std/src/sys/personality/dwarf/mod.rs b/.../std/src/sys/pal/personality/dwarf/mod.rs → library/std/src/sys/personality/dwarf/mod.rs
diff --git a/...td/src/sys/pal/personality/dwarf/tests.rs → ...ry/std/src/sys/personality/dwarf/tests.rs b/...td/src/sys/pal/personality/dwarf/tests.rs → ...ry/std/src/sys/personality/dwarf/tests.rs
diff --git a/library/std/src/sys/pal/personality/emcc.rs → library/std/src/sys/personality/emcc.rs b/library/std/src/sys/pal/personality/emcc.rs → library/std/src/sys/personality/emcc.rs
diff --git a/library/std/src/sys/pal/personality/gcc.rs → library/std/src/sys/personality/gcc.rs b/library/std/src/sys/pal/personality/gcc.rs → library/std/src/sys/personality/gcc.rs
diff --git a/library/std/src/sys/pal/personality/mod.rs → library/std/src/sys/personality/mod.rs b/library/std/src/sys/pal/personality/mod.rs → library/std/src/sys/personality/mod.rs
diff --git 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",