Skip to content

Commit

Permalink
Rollup merge of rust-lang#121758 - joboet:move_pal_thread_local, r=Ch…
Browse files Browse the repository at this point in the history
…risDenton

Move thread local implementation to `sys`

Part of rust-lang#117276.
  • Loading branch information
matthiaskrgr authored Mar 2, 2024
2 parents 1af11b1 + 45ca53f commit 26bac2a
Show file tree
Hide file tree
Showing 7 changed files with 4 additions and 3 deletions.
3 changes: 3 additions & 0 deletions library/std/src/sys/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 0 additions & 2 deletions library/std/src/sys/pal/common/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@

pub mod alloc;
pub mod small_c_string;
#[allow(unused_imports)]
pub mod thread_local;

#[cfg(test)]
mod tests;
File renamed without changes.
2 changes: 1 addition & 1 deletion library/std/src/thread/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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};
}
}
}
Expand Down

0 comments on commit 26bac2a

Please sign in to comment.