Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

SGX mutex is movable #85029

Merged
merged 1 commit into from
May 7, 2021
Merged

SGX mutex is movable #85029

merged 1 commit into from
May 7, 2021

Conversation

jethrogb
Copy link
Contributor

@jethrogb jethrogb commented May 7, 2021

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label May 7, 2021
@@ -8,7 +8,7 @@ pub struct Mutex {
inner: SpinMutex<WaitVariable<bool>>,
}

pub type MovableMutex = Box<Mutex>;
pub type MovableMutex = Mutex;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this truly a pub type or just pub(crate) one? If the former, then this is a breaking change.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pretty much everything in sys is just pub(crate). The only thing we expose is std::sync::Mutex; all the mutex stuff in sys and sys_common are just implementation details.

@m-ou-se m-ou-se added O-SGX Target: SGX T-libs Relevant to the library team, which will review and decide on the PR/issue. labels May 7, 2021
@m-ou-se
Copy link
Member

m-ou-se commented May 7, 2021

@bors r+

@bors
Copy link
Contributor

bors commented May 7, 2021

📌 Commit 30b82e0 has been approved by m-ou-se

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels May 7, 2021
Dylan-DPC-zz pushed a commit to Dylan-DPC-zz/rust that referenced this pull request May 7, 2021
…ou-se

SGX mutex is movable

r? `@m-ou-se`
bors added a commit to rust-lang-ci/rust that referenced this pull request May 7, 2021
Rollup of 9 pull requests

Successful merges:

 - rust-lang#84254 (illumos should put libc last in library search order)
 - rust-lang#84442 (Unify rustc and rustdoc parsing of `cfg()`)
 - rust-lang#84655 (Cleanup of `wasm`)
 - rust-lang#84866 (linker: Avoid library duplication with `/WHOLEARCHIVE`)
 - rust-lang#84930 (rename LLVM target for RustyHermit)
 - rust-lang#84991 (rustc: Support Rust-specific features in -Ctarget-feature)
 - rust-lang#85029 (SGX mutex is movable)
 - rust-lang#85030 (Rearrange SGX split module files)
 - rust-lang#85033 (some further small cleanups)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 73d3544 into rust-lang:master May 7, 2021
@rustbot rustbot added this to the 1.54.0 milestone May 7, 2021
GuillaumeGomez added a commit to GuillaumeGomez/rust that referenced this pull request Jul 27, 2021
…=dtolnay

SGX mutex is *not* moveable

Reverts the erroneous change in rust-lang#85029.
JohnTitor added a commit to JohnTitor/rust that referenced this pull request Jul 28, 2021
…=dtolnay

SGX mutex is *not* moveable

Reverts the erroneous change in rust-lang#85029.
JohnTitor added a commit to JohnTitor/rust that referenced this pull request Jul 28, 2021
…=dtolnay

SGX mutex is *not* moveable

Reverts the erroneous change in rust-lang#85029.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
O-SGX Target: SGX S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-libs Relevant to the library team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants