Unrolled build for rust-lang#121758

Rollup merge of rust-lang#121758 - joboet:move_pal_thread_local, r=ChrisDenton Move thread local implementation to `sys` Part of rust-lang#117276.
rust-lang-ci · Mar 2, 2024 · ea55f8c · ea55f8c
2 parents 5257aee + 45ca53f
commit ea55f8c
Show file tree

Hide file tree

Showing 7 changed files with 4 additions and 3 deletions.
diff --git a/library/std/src/sys/mod.rs b/library/std/src/sys/mod.rs
@@ -9,6 +9,9 @@ pub mod cmath;
 pub mod locks;
 pub mod os_str;
 pub mod path;
+#[allow(dead_code)]
+#[allow(unused_imports)]
+pub mod thread_local;
 
 // FIXME(117276): remove this, move feature implementations into individual
 //                submodules.

diff --git a/library/std/src/sys/pal/common/mod.rs b/library/std/src/sys/pal/common/mod.rs
@@ -12,8 +12,6 @@
 
 pub mod alloc;
 pub mod small_c_string;
-#[allow(unused_imports)]
-pub mod thread_local;
 
 #[cfg(test)]
 mod tests;
diff --git a/...sys/pal/common/thread_local/fast_local.rs → ...ry/std/src/sys/thread_local/fast_local.rs b/...sys/pal/common/thread_local/fast_local.rs → ...ry/std/src/sys/thread_local/fast_local.rs
diff --git a/...td/src/sys/pal/common/thread_local/mod.rs → library/std/src/sys/thread_local/mod.rs b/...td/src/sys/pal/common/thread_local/mod.rs → library/std/src/sys/thread_local/mod.rs
diff --git a/...c/sys/pal/common/thread_local/os_local.rs → library/std/src/sys/thread_local/os_local.rs b/...c/sys/pal/common/thread_local/os_local.rs → library/std/src/sys/thread_local/os_local.rs
diff --git a/...s/pal/common/thread_local/static_local.rs → .../std/src/sys/thread_local/static_local.rs b/...s/pal/common/thread_local/static_local.rs → .../std/src/sys/thread_local/static_local.rs
diff --git a/library/std/src/thread/mod.rs b/library/std/src/thread/mod.rs
@@ -205,7 +205,7 @@ cfg_if::cfg_if! {
         #[doc(hidden)]
         #[unstable(feature = "thread_local_internals", issue = "none")]
         pub mod local_impl {
-            pub use crate::sys::common::thread_local::{thread_local_inner, Key, abort_on_dtor_unwind};
+            pub use crate::sys::thread_local::{thread_local_inner, Key, abort_on_dtor_unwind};
         }
     }
 }