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 backports #94545

Merged
merged 3 commits into from
Mar 3, 2022
Merged

[beta] Beta backports #94545

merged 3 commits into from
Mar 3, 2022

Conversation

ehuss
Copy link
Contributor

@ehuss ehuss commented Mar 3, 2022

ehuss and others added 3 commits March 2, 2022 20:14
@ehuss
[beta] Update cargo
cace605
@Dylan-DPC @ehuss
Rollup merge of rust-lang#94315 - lcnr:auto-trait-lint-update, r=oli-obk
150cc0c 
update auto trait lint for `PhantomData`

cc rust-lang#93367 (comment)
@bors @ehuss
Auto merge of rust-lang#93516 - nagisa:branch-protection, r=cjgillot
7eda329 
No branch protection metadata unless enabled

Even if we emit metadata disabling branch protection, this metadata may
conflict with other modules (e.g. during LTO) that have different branch
protection metadata set.

This is an unstable flag and feature, so ideally the flag not being
specified should act as if the feature wasn't implemented in the first
place.

Additionally this PR also ensures we emit an error if
`-Zbranch-protection` is set on targets other than the supported
aarch64. For now the error is being output from codegen, but ideally it
should be moved to earlier in the pipeline before stabilization.
@ehuss ehuss self-assigned this Mar 3, 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-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Mar 3, 2022
@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Mar 3, 2022
@ehuss
Copy link
Contributor Author

ehuss commented Mar 3, 2022

@bors r+ rollup=never p=1

@bors
Copy link
Contributor

bors commented Mar 3, 2022

📌 Commit 7eda329 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 Mar 3, 2022
@bors
Copy link
Contributor

bors commented Mar 3, 2022

⌛ Testing commit 7eda329 with merge c1d075a...

@bors
Copy link
Contributor

bors commented Mar 3, 2022

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

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Mar 3, 2022
@bors bors merged commit c1d075a into rust-lang:beta Mar 3, 2022
@rustbot rustbot added this to the 1.60.0 milestone Mar 3, 2022
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-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
1.60.0
Development

Successfully merging this pull request may close these issues.
5 participants
@ehuss @rust-highfive @bors @rustbot @Dylan-DPC