Skip to content

Rollup of 5 pull requests #95526

New issue

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

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

Already on GitHub? # to your account

Merged
merged 12 commits into from
Mar 31, 2022
Merged

Rollup of 5 pull requests #95526

merged 12 commits into from
Mar 31, 2022

Conversation

Dylan-DPC
Copy link
Member

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

ehuss and others added 12 commits March 27, 2022 15:13
…box, r=estebank

Specialize infinite-type "insert some indirection" suggestion for Option

Suggest `Option<Box<_>>` instead of `Box<Option<_>>` for infinitely-recursive members of a struct.

Not sure if I can get the span of the generic subty of the Option so I can make this a `+++`-style suggestion. The current output is a tiny bit less fancy looking than the original suggestion.

Should I limit the specialization to just `Option<Box<TheOuterStruct>>`? Because right now it applies to all `Option` members in the struct that are returned by `Representability::SelfRecursive`.

Fixes rust-lang#91402

r? `@estebank`
(since you wrote the original suggestion and are definitely most familiar with it!)
…zed, r=Dylan-DPC

Update target_has_atomic documentation for stabilization

`cfg(target_has_atomic)` was stabilized in rust-lang#93824, but this small note in the docs was not updated at the time.
small rustc_borrowck cleanup

r? `@jackh726` because of the second commit, seems like that comment was missed in rust-lang#91243
remove unused field from `infcx`

r? `@oli-obk` did we stop needing that for opaque types?
@rustbot rustbot added T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. rollup A PR which is a rollup labels Mar 31, 2022
@Dylan-DPC
Copy link
Member Author

@bors r+ rollup=never p=5

@bors
Copy link
Collaborator

bors commented Mar 31, 2022

📌 Commit 1074c81 has been approved by Dylan-DPC

@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Mar 31, 2022
@bors
Copy link
Collaborator

bors commented Mar 31, 2022

⌛ Testing commit 1074c81 with merge 0677edc...

@bors
Copy link
Collaborator

bors commented Mar 31, 2022

☀️ Test successful - checks-actions
Approved by: Dylan-DPC
Pushing 0677edc to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Mar 31, 2022
@bors bors merged commit 0677edc into rust-lang:master Mar 31, 2022
@rustbot rustbot added this to the 1.61.0 milestone Mar 31, 2022
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (0677edc): comparison url.

Summary: This benchmark run did not return any relevant results.

If you disagree with this performance assessment, please file an issue in rust-lang/rustc-perf.

@rustbot label: -perf-regression

# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
merged-by-bors This PR was explicitly merged by bors. rollup A PR which is a rollup 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
Development

Successfully merging this pull request may close these issues.

8 participants