Move thread parker to sys_common.

rust-lang · Sep 27, 2020 · 0b73fd7 · 0b73fd7
1 parent 4301b5c
commit 0b73fd7
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 3 deletions.
diff --git a/library/std/src/sys_common/mod.rs b/library/std/src/sys_common/mod.rs
@@ -66,6 +66,7 @@ pub mod thread;
 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 → ...std/src/sys_common/thread_parker/futex.rs b/library/std/src/thread/parker/futex.rs → ...std/src/sys_common/thread_parker/futex.rs
diff --git a/library/std/src/thread/parker/generic.rs → ...d/src/sys_common/thread_parker/generic.rs b/library/std/src/thread/parker/generic.rs → ...d/src/sys_common/thread_parker/generic.rs
diff --git a/library/std/src/thread/parker/mod.rs → ...y/std/src/sys_common/thread_parker/mod.rs b/library/std/src/thread/parker/mod.rs → ...y/std/src/sys_common/thread_parker/mod.rs
diff --git 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::thread as imp;
 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