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.

Sign up for GitHub

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

Jump to bottom

[beta] Beta 1.63 backports #98949

Merged
merged 3 commits into from
Jul 6, 2022
Merged

[beta] Beta 1.63 backports #98949

merged 3 commits into from
Jul 6, 2022

Conversation

ehuss
Copy link
Contributor

@ehuss ehuss commented Jul 5, 2022

ehuss and others added 3 commits July 5, 2022 11:04
@ehuss
[beta] Update cargo
645c322
@matthiaskrgr @ehuss
Rollup merge of rust-lang#98503 - RalfJung:scope-race, r=m-ou-se
f0f48ee 
fix data race in thread::scope

Puts the `ScopeData` into an `Arc` so it sticks around as long as we need it.
This means one extra `Arc::clone` per spawned scoped thread, which I hope is fine.

Fixes rust-lang#98498
r? `````@m-ou-se`````
@matthiaskrgr @ehuss
Rollup merge of rust-lang#98126 - fortanix:raoul/mitigate_stale_data_…
372fa7c 
…vulnerability, r=cuviper

Mitigate MMIO stale data vulnerability

Intel publicly disclosed the MMIO stale data vulnerability on June 14. To mitigate this vulnerability, compiler changes are required for the `x86_64-fortanix-unknown-sgx` target.
cc: ````@jethrogb````
@ehuss ehuss self-assigned this Jul 5, 2022
@rust-highfive
Copy link
Collaborator

⚠️ Warning ⚠️

  • Pull requests are usually filed against the master branch for this repo, but this one is against beta. Please double check that you specified the right target!
  • These commits modify submodules.

@rustbot rustbot added the T-libs Relevant to the library team, which will review and decide on the PR/issue. label Jul 5, 2022
@rustbot
Copy link
Collaborator

rustbot commented Jul 5, 2022

Hey! It looks like you've submitted a new PR for the library teams!

If this PR contains changes to any rust-lang/rust public library APIs then please comment with @rustbot label +T-libs-api -T-libs to tag it appropriately. If this PR contains changes to any unstable APIs please edit the PR description to add a link to the relevant API Change Proposal or create one if you haven't already. If you're unsure where your change falls no worries, just leave it as is and the reviewer will take a look and make a decision to forward on if necessary.

Examples of T-libs-api changes:

  • Stabilizing library features
  • Introducing insta-stable changes such as new implementations of existing stable traits on existing stable types
  • Introducing new or changing existing unstable library APIs (excluding permanently unstable features / features without a tracking issue)
  • Changing public documentation in ways that create new stability guarantees
  • Changing observable runtime behavior of library APIs

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 5, 2022
@ehuss
Copy link
Contributor Author

ehuss commented Jul 5, 2022

@bors r+ rollup=never

@bors
Copy link
Contributor

bors commented Jul 5, 2022

📌 Commit 372fa7c has been approved by ehuss

@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 Jul 5, 2022
@ehuss
Copy link
Contributor Author

ehuss commented Jul 5, 2022

@bors r-

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jul 5, 2022
@ehuss
Copy link
Contributor Author

ehuss commented Jul 5, 2022

There was a spurious error with the RLS test client_invalid_toml_manifest.

@bors r+

@bors
Copy link
Contributor

bors commented Jul 5, 2022

📌 Commit 372fa7c has been approved by ehuss

@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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jul 5, 2022
@Dylan-DPC
Copy link
Member

@bors p=1

@bors
Copy link
Contributor

bors commented Jul 6, 2022

⌛ Testing commit 372fa7c with merge 94811fd...

@bors
Copy link
Contributor

bors commented Jul 6, 2022

☀️ Test successful - checks-actions
Approved by: ehuss
Pushing 94811fd to beta...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jul 6, 2022
@bors bors merged commit 94811fd into rust-lang:beta Jul 6, 2022
@rustbot rustbot added this to the 1.63.0 milestone Jul 6, 2022
@cuviper cuviper mentioned this pull request Jul 15, 2022
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@ehuss ehuss

Labels
merged-by-bors This PR was explicitly merged by bors. 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
Milestone
1.63.0
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@ehuss @rust-highfive @rustbot @bors @Dylan-DPC @matthiaskrgr