move thread.rs into concurrency

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/lib.rs

@@ -62,7 +62,6 @@
 mod range_map;
 mod shims;
 mod stacked_borrows;
-pub mod thread;
 
 // Establish a "crate-wide prelude": we often import `crate::*`.
 
@@ -104,10 +103,10 @@
 pub use crate::stacked_borrows::{
     CallId, EvalContextExt as StackedBorEvalContextExt, Item, Permission, SbTag, Stack, Stacks,
 };
-pub use crate::thread::{
+pub use concurrency::sync::{CondvarId, EvalContextExt as SyncEvalContextExt, MutexId, RwLockId};
+pub use concurrency::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/shims/time.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/unix/linux/sync.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/sync.rs

@@ -3,7 +3,7 @@
 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.