From 5259fb9bb0f54bbcfdccce3a1fc28e01d0066e2c Mon Sep 17 00:00:00 2001
From: Hiroki6 <hirokifujino0108@gmail.com>
Date: Mon, 22 Aug 2022 19:13:39 +0200
Subject: [PATCH 1/2] move thread.rs into concurrency

---
 src/concurrency/mod.rs          | 1 +
 src/{ => concurrency}/thread.rs | 0
 src/lib.rs                      | 5 ++---
 src/shims/time.rs               | 2 +-
 src/shims/unix/linux/sync.rs    | 2 +-
 src/shims/unix/sync.rs          | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)
 rename src/{ => concurrency}/thread.rs (100%)

diff --git a/src/concurrency/mod.rs b/src/concurrency/mod.rs
index 07c3f0d5993..61ef3d5640e 100644
--- a/src/concurrency/mod.rs
+++ b/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;
diff --git a/src/thread.rs b/src/concurrency/thread.rs
similarity index 100%
rename from src/thread.rs
rename to src/concurrency/thread.rs
diff --git a/src/lib.rs b/src/lib.rs
index 5657bba6478..846290ae6c6 100644
--- a/src/lib.rs
+++ b/src/lib.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::*`.
 
@@ -104,10 +103,10 @@ pub use crate::range_map::RangeMap;
 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] = &[
diff --git a/src/shims/time.rs b/src/shims/time.rs
index 3f4600e0e34..a574a0612c4 100644
--- a/src/shims/time.rs
+++ b/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`.
diff --git a/src/shims/unix/linux/sync.rs b/src/shims/unix/linux/sync.rs
index f9c97a23721..73a042d45b8 100644
--- a/src/shims/unix/linux/sync.rs
+++ b/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};
diff --git a/src/shims/unix/sync.rs b/src/shims/unix/sync.rs
index 246cb100bcb..b8504fb08d4 100644
--- a/src/shims/unix/sync.rs
+++ b/src/shims/unix/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.

From 2107cbbe2fb6b6ad3bbfc45464e3b08868de8d29 Mon Sep 17 00:00:00 2001
From: Ralf Jung <post@ralfj.de>
Date: Mon, 22 Aug 2022 14:48:47 -0400
Subject: [PATCH 2/2] reorganize imports a bit

---
 src/lib.rs | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/lib.rs b/src/lib.rs
index 846290ae6c6..bd0cb805702 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -80,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,
@@ -103,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 concurrency::sync::{CondvarId, EvalContextExt as SyncEvalContextExt, MutexId, RwLockId};
-pub use concurrency::thread::{
-    EvalContextExt as ThreadsEvalContextExt, SchedulingAction, ThreadId, ThreadManager, ThreadState,
-};
+
 /// 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] = &[