From bfa84842e546a5fb2d1c69ba499ddc94bee1e01a Mon Sep 17 00:00:00 2001
From: Jethro Beekman <jethro@fortanix.com>
Date: Fri, 7 May 2021 13:40:43 +0200
Subject: [PATCH] Rearrange SGX split module files

In #75979 several inlined modules were split out into multiple files.
This PR keeps the multiple files but moves a few things around to
organize things in a coherent way.
---
 library/std/src/sys/sgx/abi/{tls.rs => tls/mod.rs}         | 0
 library/std/src/sys/sgx/{waitqueue.rs => waitqueue/mod.rs} | 7 +------
 library/std/src/sys/sgx/waitqueue/spin_mutex.rs            | 3 +++
 library/std/src/sys/sgx/waitqueue/unsafe_list.rs           | 3 +++
 4 files changed, 7 insertions(+), 6 deletions(-)
 rename library/std/src/sys/sgx/abi/{tls.rs => tls/mod.rs} (100%)
 rename library/std/src/sys/sgx/{waitqueue.rs => waitqueue/mod.rs} (97%)

diff --git a/library/std/src/sys/sgx/abi/tls.rs b/library/std/src/sys/sgx/abi/tls/mod.rs
similarity index 100%
rename from library/std/src/sys/sgx/abi/tls.rs
rename to library/std/src/sys/sgx/abi/tls/mod.rs
diff --git a/library/std/src/sys/sgx/waitqueue.rs b/library/std/src/sys/sgx/waitqueue/mod.rs
similarity index 97%
rename from library/std/src/sys/sgx/waitqueue.rs
rename to library/std/src/sys/sgx/waitqueue/mod.rs
index e464dc3ee9d40..61bb11d9a6fad 100644
--- a/library/std/src/sys/sgx/waitqueue.rs
+++ b/library/std/src/sys/sgx/waitqueue/mod.rs
@@ -13,13 +13,8 @@
 #[cfg(test)]
 mod tests;
 
-/// A doubly-linked list where callers are in charge of memory allocation
-/// of the nodes in the list.
-mod unsafe_list;
-
-/// Trivial spinlock-based implementation of `sync::Mutex`.
-// FIXME: Perhaps use Intel TSX to avoid locking?
 mod spin_mutex;
+mod unsafe_list;
 
 use crate::num::NonZeroUsize;
 use crate::ops::{Deref, DerefMut};
diff --git a/library/std/src/sys/sgx/waitqueue/spin_mutex.rs b/library/std/src/sys/sgx/waitqueue/spin_mutex.rs
index 7f1a671bab4eb..f6e851ccaddfa 100644
--- a/library/std/src/sys/sgx/waitqueue/spin_mutex.rs
+++ b/library/std/src/sys/sgx/waitqueue/spin_mutex.rs
@@ -1,3 +1,6 @@
+//! Trivial spinlock-based implementation of `sync::Mutex`.
+// FIXME: Perhaps use Intel TSX to avoid locking?
+
 #[cfg(test)]
 mod tests;
 
diff --git a/library/std/src/sys/sgx/waitqueue/unsafe_list.rs b/library/std/src/sys/sgx/waitqueue/unsafe_list.rs
index 0834d2593fc32..cf2f0886c1546 100644
--- a/library/std/src/sys/sgx/waitqueue/unsafe_list.rs
+++ b/library/std/src/sys/sgx/waitqueue/unsafe_list.rs
@@ -1,3 +1,6 @@
+//! A doubly-linked list where callers are in charge of memory allocation
+//! of the nodes in the list.
+
 #[cfg(test)]
 mod tests;