Skip to content

Rollup of 6 pull requests #121086

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
Feb 14, 2024
Merged

Rollup of 6 pull requests #121086

merged 12 commits into from
Feb 14, 2024

Conversation

GuillaumeGomez
Copy link
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

compiler-errors and others added 12 commits February 13, 2024 16:05
…ve, r=pnkfelix

Remove importing suggestions when there is a shadowed typo candidate

Fixes rust-lang#120559
… r=calebcartwright

Format `async` trait bounds in rustfmt

r? `@ytmimi` or `@calebcartwright`

This PR opts to do formatting in the rust-lang/rust tree because otherwise we'd have to wait until a full sync, and rustfmt is currently totally removing the `async` keyword.

cc rust-lang/rustfmt#6070
…range, r=oli-obk

Fix false positive with if let and ranges

Fixes rust-lang#121070
…kind, r=compiler-errors

Extend documentation for `Ty::to_opt_closure_kind` method

This API was... surprising to use. With a little extra documentation, the weirdness can be reduced quite a lot. :)

r? `@compiler-errors`
…=WaffleLapkin

Make sure `tcx.create_def` also depends on the forever red node, instead of just `tcx.at(span).create_def`

oversight from rust-lang#119136

Not actually an issue, because all uses of `tcx.create_def` were in the resolver, which is `eval_always`, but still good to harden against future uses of `create_def`

cc `@petrochenkov` `@WaffleLapkin`
@rustbot rustbot added A-testsuite Area: The testsuite used to check the correctness of rustc S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. rollup A PR which is a rollup labels Feb 14, 2024
@GuillaumeGomez
Copy link
Member Author

@bors r+ p=5 rollup=never

@bors
Copy link
Collaborator

bors commented Feb 14, 2024

📌 Commit 2062325 has been approved by GuillaumeGomez

It is now in the queue for this repository.

@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 Feb 14, 2024
@bors
Copy link
Collaborator

bors commented Feb 14, 2024

⌛ Testing commit 2062325 with merge 502ce82...

@bors
Copy link
Collaborator

bors commented Feb 14, 2024

☀️ Test successful - checks-actions
Approved by: GuillaumeGomez
Pushing 502ce82 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Feb 14, 2024
@bors bors merged commit 502ce82 into rust-lang:master Feb 14, 2024
@rustbot rustbot added this to the 1.78.0 milestone Feb 14, 2024
@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#120893 Move some tests dc9c8ed94be6fc0c2059e9f26911f0e70031eb86 (link)
#120966 Remove importing suggestions when there is a shadowed typo … 85e5dd304e5ed106a5ee0b1dcb7ccbffb89aa56d (link)
#121035 Format async trait bounds in rustfmt acf9e4bfdc195d65a142eac3bd4e5a6e47111782 (link)
#121075 Fix false positive with if let and ranges 46d5e8bcffb98fe3f438477eb624295b13685119 (link)
#121083 Extend documentation for Ty::to_opt_closure_kind method 48a7cd1ad5894604386ba3b6660b08526218f2cb (link)
#121084 Make sure tcx.create_def also depends on the forever red … bd8c961d5e0939714bd1d82bb74b93542d3f33ac (link)

previous master: 340bb19fea

In the case of a perf regression, run the following command for each PR you suspect might be the cause: @rust-timer build $SHA

# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
A-testsuite Area: The testsuite used to check the correctness of rustc 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-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) 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