diff options
| author | bors <bors@rust-lang.org> | 2023-07-10 05:19:37 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-07-10 05:19:37 +0000 |
| commit | 743333f3dd90721461c09387ec73d09c080d5f5f (patch) | |
| tree | 65d1ec367b706398363c43a71ac1a09c58093643 | |
| parent | 71f71a5397c42fec01f5c1045c638d961fa9f7ca (diff) | |
| parent | 90e11a2a58ce1565786f6aff7bbdf3f314c6b458 (diff) | |
| download | rust-743333f3dd90721461c09387ec73d09c080d5f5f.tar.gz rust-743333f3dd90721461c09387ec73d09c080d5f5f.zip | |
Auto merge of #108796 - devsnek:personality-pal-exception, r=workingjubilee
move personality to sys this moves `personality` to sys, removing another PAL exception
| -rw-r--r-- | library/std/src/lib.rs | 1 | ||||
| -rw-r--r-- | library/std/src/sys/mod.rs | 1 | ||||
| -rw-r--r-- | library/std/src/sys/personality/dwarf/eh.rs (renamed from library/std/src/personality/dwarf/eh.rs) | 0 | ||||
| -rw-r--r-- | library/std/src/sys/personality/dwarf/mod.rs (renamed from library/std/src/personality/dwarf/mod.rs) | 0 | ||||
| -rw-r--r-- | library/std/src/sys/personality/dwarf/tests.rs (renamed from library/std/src/personality/dwarf/tests.rs) | 0 | ||||
| -rw-r--r-- | library/std/src/sys/personality/emcc.rs (renamed from library/std/src/personality/emcc.rs) | 0 | ||||
| -rw-r--r-- | library/std/src/sys/personality/gcc.rs (renamed from library/std/src/personality/gcc.rs) | 0 | ||||
| -rw-r--r-- | library/std/src/sys/personality/mod.rs (renamed from library/std/src/personality.rs) | 0 | ||||
| -rw-r--r-- | src/tools/tidy/src/pal.rs | 2 |
9 files changed, 1 insertions, 3 deletions
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 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 index a9ea5f0de89..beea3f23c2d 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 index 79624703a4c..79624703a4c 100644 --- a/library/std/src/personality/dwarf/eh.rs +++ b/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 index 652fbe95a14..652fbe95a14 100644 --- a/library/std/src/personality/dwarf/mod.rs +++ b/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 index 1644f37083a..1644f37083a 100644 --- a/library/std/src/personality/dwarf/tests.rs +++ b/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 index cb52ae89b19..cb52ae89b19 100644 --- a/library/std/src/personality/emcc.rs +++ b/library/std/src/sys/personality/emcc.rs diff --git a/library/std/src/personality/gcc.rs b/library/std/src/sys/personality/gcc.rs index 6552d96ca69..6552d96ca69 100644 --- a/library/std/src/personality/gcc.rs +++ b/library/std/src/sys/personality/gcc.rs diff --git a/library/std/src/personality.rs b/library/std/src/sys/personality/mod.rs index 386a399f532..386a399f532 100644 --- a/library/std/src/personality.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 abb2a35f085..62c070221dc 100644 --- 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) { |
