about summary refs log tree commit diff
path: root/library/std/src
diff options
context:
space:
mode:
authorMara Bos <m-ou.se@m-ou.se>2020-09-27 12:27:27 +0200
committerMara Bos <m-ou.se@m-ou.se>2020-09-27 12:28:58 +0200
commit0b73fd7105db81a994a81b775a43bbdb1be3c76a (patch)
tree4960929c8a9c9545daa1e2e7051f2a7fa325dba8 /library/std/src
parent4301b5c1cc9652247b1c465d304ff9c94df294ef (diff)
downloadrust-0b73fd7105db81a994a81b775a43bbdb1be3c76a.tar.gz
rust-0b73fd7105db81a994a81b775a43bbdb1be3c76a.zip
Move thread parker to sys_common.
Diffstat (limited to 'library/std/src')
-rw-r--r--library/std/src/sys_common/mod.rs1
-rw-r--r--library/std/src/sys_common/thread_parker/futex.rs (renamed from library/std/src/thread/parker/futex.rs)0
-rw-r--r--library/std/src/sys_common/thread_parker/generic.rs (renamed from library/std/src/thread/parker/generic.rs)0
-rw-r--r--library/std/src/sys_common/thread_parker/mod.rs (renamed from library/std/src/thread/parker/mod.rs)0
-rw-r--r--library/std/src/thread/mod.rs4
5 files changed, 2 insertions, 3 deletions
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 @@ 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 b/library/std/src/sys_common/thread_parker/futex.rs
index a5d4927dcc5..a5d4927dcc5 100644
--- a/library/std/src/thread/parker/futex.rs
+++ b/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
index 14cfa958e5e..14cfa958e5e 100644
--- a/library/std/src/thread/parker/generic.rs
+++ b/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
index 23c17c8e2cf..23c17c8e2cf 100644
--- a/library/std/src/thread/parker/mod.rs
+++ b/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::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