diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2024-01-13 22:35:09 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-13 22:35:09 +0100 |
| commit | 3a33a4b8f54d4bdd8f1d92f58b91e91aa4d4e720 (patch) | |
| tree | ac6c7808c3a7f696cd37492e591d9a2ce7246256 | |
| parent | 70bc26d0e7268e12b7e487ee8ec9d5953b5c6aac (diff) | |
| parent | b8d996c09e3aba782ac02334ac3ded7b74162d89 (diff) | |
| download | rust-3a33a4b8f54d4bdd8f1d92f58b91e91aa4d4e720.tar.gz rust-3a33a4b8f54d4bdd8f1d92f58b91e91aa4d4e720.zip | |
Rollup merge of #119935 - joboet:move_pal_personality, r=ChrisDenton
Move personality implementation out of PAL The module already follows the new convention described in #117276. This PR also includes a small fix in the tidy pal check, that was just an oversight in #117285.
| -rw-r--r-- | library/std/src/sys/mod.rs | 2 | ||||
| -rw-r--r-- | library/std/src/sys/pal/mod.rs | 1 | ||||
| -rw-r--r-- | library/std/src/sys/personality/dwarf/eh.rs (renamed from library/std/src/sys/pal/personality/dwarf/eh.rs) | 0 | ||||
| -rw-r--r-- | library/std/src/sys/personality/dwarf/mod.rs (renamed from library/std/src/sys/pal/personality/dwarf/mod.rs) | 0 | ||||
| -rw-r--r-- | library/std/src/sys/personality/dwarf/tests.rs (renamed from library/std/src/sys/pal/personality/dwarf/tests.rs) | 0 | ||||
| -rw-r--r-- | library/std/src/sys/personality/emcc.rs (renamed from library/std/src/sys/pal/personality/emcc.rs) | 0 | ||||
| -rw-r--r-- | library/std/src/sys/personality/gcc.rs (renamed from library/std/src/sys/pal/personality/gcc.rs) | 0 | ||||
| -rw-r--r-- | library/std/src/sys/personality/mod.rs (renamed from library/std/src/sys/pal/personality/mod.rs) | 0 | ||||
| -rw-r--r-- | src/tools/tidy/src/pal.rs | 4 |
9 files changed, 4 insertions, 3 deletions
diff --git a/library/std/src/sys/mod.rs b/library/std/src/sys/mod.rs index 0cd4528b69e..bbdcb32606c 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 88420bd3612..66b2a4b8885 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 index a78084de0fa..a78084de0fa 100644 --- a/library/std/src/sys/pal/personality/dwarf/eh.rs +++ b/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 index 652fbe95a14..652fbe95a14 100644 --- a/library/std/src/sys/pal/personality/dwarf/mod.rs +++ b/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 index 1644f37083a..1644f37083a 100644 --- a/library/std/src/sys/pal/personality/dwarf/tests.rs +++ b/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 index cb52ae89b19..cb52ae89b19 100644 --- a/library/std/src/sys/pal/personality/emcc.rs +++ b/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 index 6f317131145..6f317131145 100644 --- a/library/std/src/sys/pal/personality/gcc.rs +++ b/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 index d37b8ce6346..d37b8ce6346 100644 --- a/library/std/src/sys/pal/personality/mod.rs +++ b/library/std/src/sys/personality/mod.rs diff --git a/src/tools/tidy/src/pal.rs b/src/tools/tidy/src/pal.rs index 398257d2bc2..7e5656926ab 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", |
