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 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 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 abb2a35f085..62c070221dc 100644 --- a/src/tools/tidy/src/pal.rs +++ b/src/tools/tidy/src/pal.rs @@ -56,8 +56,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) {