diff --git a/library/std/src/sys_common/mod.rs b/library/std/src/sys_common/mod.rs index 28cdfefb12a..234b257aa92 100644 --- a/library/std/src/sys_common/mod.rs +++ b/library/std/src/sys_common/mod.rs @@ -66,6 +66,7 @@ macro_rules! rtunwrap { pub mod thread_info; pub mod thread_local_dtor; pub mod thread_local_key; +pub mod thread_parker; pub mod util; pub mod wtf8; diff --git a/library/std/src/thread/parker/futex.rs b/library/std/src/sys_common/thread_parker/futex.rs similarity index 100% rename from library/std/src/thread/parker/futex.rs rename to library/std/src/sys_common/thread_parker/futex.rs diff --git a/library/std/src/thread/parker/generic.rs b/library/std/src/sys_common/thread_parker/generic.rs similarity index 100% rename from library/std/src/thread/parker/generic.rs rename to library/std/src/sys_common/thread_parker/generic.rs diff --git a/library/std/src/thread/parker/mod.rs b/library/std/src/sys_common/thread_parker/mod.rs similarity index 100% rename from library/std/src/thread/parker/mod.rs rename to library/std/src/sys_common/thread_parker/mod.rs diff --git a/library/std/src/thread/mod.rs b/library/std/src/thread/mod.rs index 45430e58cbb..fb2fbb5bf2d 100644 --- a/library/std/src/thread/mod.rs +++ b/library/std/src/thread/mod.rs @@ -149,8 +149,6 @@ #[cfg(all(test, not(target_os = "emscripten")))] mod tests; -mod parker; - use crate::any::Any; use crate::cell::UnsafeCell; use crate::ffi::{CStr, CString}; @@ -166,9 +164,9 @@ use crate::sys_common::mutex; use crate::sys_common::thread; use crate::sys_common::thread_info; +use crate::sys_common::thread_parker::Parker; use crate::sys_common::{AsInner, IntoInner}; use crate::time::Duration; -use parker::Parker; //////////////////////////////////////////////////////////////////////////////// // Thread-local storage