Skip to content

[beta-1.85] backports #136391

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

Jump to bottom
Merged
merged 5 commits into from
Feb 1, 2025
Merged

[beta-1.85] backports #136391

merged 5 commits into from
Feb 1, 2025

Conversation

ehuss
Copy link
Contributor

@ehuss ehuss commented Feb 1, 2025

matthiaskrgr and others added 5 commits February 1, 2025 07:25
@matthiaskrgr @ehuss
Rollup merge of rust-lang#135852 - lukas-code:asyncfn-prelude-core, r…
ee94112 
…=compiler-errors

Add `AsyncFn*` to `core` prelude

In rust-lang#132611 these got added to the `std` prelude only, which looks like an oversight.

r? libs-api
cc `@compiler-errors`
@Veykril @ehuss
Disable some incorrect rust-analyzer diagnostics on beta
2fa9d47
@jhpratt @ehuss
Rollup merge of rust-lang#136312 - compiler-errors:overflow_delimited…
fdc22dc 
…_expr-2024, r=ytmimi

Disable `overflow_delimited_expr` in edition 2024

This reverts the style guide changes and sets the default to "false" in rustfmt for style edition 2024.

r? `@ytmimi`

cc `@rust-lang/style` `@rust-lang/rustfmt`
@ehuss
Update edition-guide
b5a02ff
@ehuss
Fix core AsyncFn stability attribute
cfe3de2
@rustbot
Copy link
Collaborator

rustbot commented Feb 1, 2025

r? @joshtriplett

rustbot has assigned @joshtriplett.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

@rustbot
Copy link
Collaborator

rustbot commented Feb 1, 2025

⚠️ Warning ⚠️

  • These commits modify submodules.

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-libs Relevant to the library team, which will review and decide on the PR/issue. T-style Relevant to the style team, which will review and decide on the PR/issue. labels Feb 1, 2025
@rustbot
Copy link
Collaborator

rustbot commented Feb 1, 2025

rust-analyzer is developed in its own repository. If possible, consider making this change to rust-lang/rust-analyzer instead.

cc @rust-lang/rust-analyzer

Some changes occurred in src/doc/style-guide

cc @rust-lang/style

Some changes occurred in src/tools/rustfmt

cc @rust-lang/rustfmt

@ehuss ehuss assigned ehuss and unassigned joshtriplett Feb 1, 2025
@ehuss
Copy link
Contributor Author

ehuss commented Feb 1, 2025

@bors r+ p=1 rollup=never

@bors
Copy link
Collaborator

bors commented Feb 1, 2025

📌 Commit cfe3de2 has been approved by ehuss

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 1, 2025
@bors
Copy link
Collaborator

bors commented Feb 1, 2025

⌛ Testing commit cfe3de2 with merge 0277061...

@bors
Copy link
Collaborator

bors commented Feb 1, 2025

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

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Feb 1, 2025
@bors bors merged commit 0277061 into rust-lang:beta Feb 1, 2025
7 checks passed
@rustbot rustbot added this to the 1.85.0 milestone Feb 1, 2025
@ehuss ehuss mentioned this pull request Feb 1, 2025
Closed
# for free to join this conversation on GitHub. Already have an account? # 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. T-style Relevant to the style team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
1.85.0
Development

Successfully merging this pull request may close these issues.
7 participants
@ehuss @rustbot @bors @joshtriplett @matthiaskrgr @Veykril @jhpratt