Rollup merge of rust-lang#85029 - jethrogb:jb/sgx-movable-mutex, r=m-ou-se

Dylan-DPC · web-flow · commit 73d3544fb96c · 2021-05-07T16:19:23.000+02:00
SGX mutex is movable

r? ``@m-ou-se``
diff --git a/library/std/src/sys/sgx/mutex.rs b/library/std/src/sys/sgx/mutex.rs
@@ -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 {

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ pub struct Mutex {`
`8`	`8`	`inner: SpinMutex<WaitVariable<bool>>,`
`9`	`9`	`}`
`10`	`10`
`11`		`-pub type MovableMutex = Box<Mutex>;`
	`11`	`+pub type MovableMutex = Mutex;`
`12`	`12`
`13`	`13`	`// Implementation according to “Operating Systems: Three Easy Pieces”, chapter 28`
`14`	`14`	`impl Mutex {`