Skip to content

Commit

Permalink
Rollup merge of rust-lang#85029 - jethrogb:jb/sgx-movable-mutex, r=m-…
Browse files Browse the repository at this point in the history
…ou-se

SGX mutex is movable

r? ``@m-ou-se``
  • Loading branch information
Dylan-DPC committed May 7, 2021
2 parents a3fbde4 + 30b82e0 commit 73d3544
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion library/std/src/sys/sgx/mutex.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ pub struct Mutex {
inner: SpinMutex<WaitVariable<bool>>,
}

pub type MovableMutex = Box<Mutex>;
pub type MovableMutex = Mutex;

// Implementation according to “Operating Systems: Three Easy Pieces”, chapter 28
impl Mutex {
Expand Down

0 comments on commit 73d3544

Please sign in to comment.