Skip to content

Commit 62b68f9

Browse files
authored
Rollup merge of #85030 - jethrogb:jb/sgx-rearrange-files, r=nagisa
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.
2 parents 73d3544 + bfa8484 commit 62b68f9

File tree

4 files changed

+7
-6
lines changed

4 files changed

+7
-6
lines changed
File renamed without changes.

Diff for: library/std/src/sys/sgx/waitqueue.rs renamed to library/std/src/sys/sgx/waitqueue/mod.rs

+1-6
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,8 @@
1313
#[cfg(test)]
1414
mod tests;
1515

16-
/// A doubly-linked list where callers are in charge of memory allocation
17-
/// of the nodes in the list.
18-
mod unsafe_list;
19-
20-
/// Trivial spinlock-based implementation of `sync::Mutex`.
21-
// FIXME: Perhaps use Intel TSX to avoid locking?
2216
mod spin_mutex;
17+
mod unsafe_list;
2318

2419
use crate::num::NonZeroUsize;
2520
use crate::ops::{Deref, DerefMut};

Diff for: library/std/src/sys/sgx/waitqueue/spin_mutex.rs

+3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
//! Trivial spinlock-based implementation of `sync::Mutex`.
2+
// FIXME: Perhaps use Intel TSX to avoid locking?
3+
14
#[cfg(test)]
25
mod tests;
36

Diff for: library/std/src/sys/sgx/waitqueue/unsafe_list.rs

+3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
//! A doubly-linked list where callers are in charge of memory allocation
2+
//! of the nodes in the list.
3+
14
#[cfg(test)]
25
mod tests;
36

0 commit comments

Comments
 (0)