Auto merge of rust-lang#2504 - Hiroki6:move-thread-to-concurrency-module, r=RalfJung

move thread.rs into concurrency

Follow-up of rust-lang/miri#2500 and closes rust-lang/miri#2199

I moved the `thread.rs` into the `concurrency` module.

Author: bors

src/concurrency/mod.rs

@@ -1,5 +1,6 @@
 pub mod data_race;
 mod range_object_map;
 pub mod sync;
+pub mod thread;
 mod vector_clock;
 pub mod weak_memory;

src/thread.rs renamed to src/concurrency/thread.rs

@@ -62,7 +62,6 @@ mod operator;
 mod range_map;
 mod shims;
 mod stacked_borrows;
-pub mod thread;
 
 // Establish a "crate-wide prelude": we often import `crate::*`.
 
@@ -81,9 +80,16 @@ pub use crate::shims::time::EvalContextExt as _;
 pub use crate::shims::tls::{EvalContextExt as _, TlsData};
 pub use crate::shims::EvalContextExt as _;
 
-pub use crate::concurrency::data_race::{
-    AtomicFenceOrd, AtomicReadOrd, AtomicRwOrd, AtomicWriteOrd,
-    EvalContextExt as DataRaceEvalContextExt,
+pub use crate::concurrency::{
+    data_race::{
+        AtomicFenceOrd, AtomicReadOrd, AtomicRwOrd, AtomicWriteOrd,
+        EvalContextExt as DataRaceEvalContextExt,
+    },
+    sync::{CondvarId, EvalContextExt as SyncEvalContextExt, MutexId, RwLockId},
+    thread::{
+        EvalContextExt as ThreadsEvalContextExt, SchedulingAction, ThreadId, ThreadManager,
+        ThreadState,
+    },
 };
 pub use crate::diagnostics::{
     register_diagnostic, report_error, EvalContextExt as DiagnosticsEvalContextExt,
@@ -104,10 +110,7 @@ pub use crate::range_map::RangeMap;
 pub use crate::stacked_borrows::{
     CallId, EvalContextExt as StackedBorEvalContextExt, Item, Permission, SbTag, Stack, Stacks,
 };
-pub use crate::thread::{
-    EvalContextExt as ThreadsEvalContextExt, SchedulingAction, ThreadId, ThreadManager, ThreadState,
-};
-pub use concurrency::sync::{CondvarId, EvalContextExt as SyncEvalContextExt, MutexId, RwLockId};
+
 /// Insert rustc arguments at the beginning of the argument list that Miri wants to be
 /// set per default, for maximal validation power.
 pub const MIRI_DEFAULT_ARGS: &[&str] = &[

src/lib.rs

@@ -1,6 +1,6 @@
 use std::time::{Duration, Instant, SystemTime};
 
-use crate::thread::Time;
+use crate::concurrency::thread::Time;
 use crate::*;
 
 /// Returns the time elapsed between the provided time and the unix epoch as a `Duration`.

src/shims/time.rs

@@ -1,4 +1,4 @@
-use crate::thread::Time;
+use crate::concurrency::thread::Time;
 use crate::*;
 use rustc_target::abi::{Align, Size};
 use std::time::{Instant, SystemTime};

src/shims/unix/linux/sync.rs

@@ -3,7 +3,7 @@ use std::time::SystemTime;
 use rustc_hir::LangItem;
 use rustc_middle::ty::{layout::TyAndLayout, query::TyCtxtAt, subst::Subst, Ty};
 
-use crate::thread::Time;
+use crate::concurrency::thread::Time;
 use crate::*;
 
 // pthread_mutexattr_t is either 4 or 8 bytes, depending on the platform.