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.

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

[beta] backports #122524

Merged
merged 6 commits into from
Mar 15, 2024
Merged

[beta] backports #122524

merged 6 commits into from
Mar 15, 2024

Conversation

cuviper
Copy link
Member

@cuviper cuviper commented Mar 15, 2024

r? cuviper

fmease and others added 6 commits March 14, 2024 18:01
…tions and anon consts

(cherry picked from commit 7d428db)
…at lint to address issue 121610.

(cherry picked from commit a8549b4)
(cherry picked from commit f86b46a)
…tests that were expecting the hard error for it.

I attempted to do this in a manner that preserved the line numbers to reduce the
review effort on the resulting diff, but we still have to deal with the
ramifications of how a future-incompat lint behaves compared to a hard-error (in
terms of its impact on the diagnostic output).

(cherry picked from commit 1c3424b)
(cherry picked from commit ae374cf)
@rustbot

This comment was marked as resolved.

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Mar 15, 2024
@cuviper
Copy link
Member Author

cuviper commented Mar 15, 2024

Nudging priority a little since branch promotion will be soon.

@bors r+ p=1 rollup=never

@bors
Copy link
Contributor

bors commented Mar 15, 2024

📌 Commit 6b0992f has been approved by cuviper

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 Mar 15, 2024
@bors
Copy link
Contributor

bors commented Mar 15, 2024

⌛ Testing commit 6b0992f with merge 2bcca41...

@bors
Copy link
Contributor

bors commented Mar 15, 2024

☀️ Test successful - checks-actions
Approved by: cuviper
Pushing 2bcca41 to beta...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Mar 15, 2024
@bors bors merged commit 2bcca41 into rust-lang:beta Mar 15, 2024
12 checks passed
@rustbot rustbot added this to the 1.77.0 milestone Mar 15, 2024
@cuviper cuviper deleted the beta-next branch March 28, 2024 17:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
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
Development

Successfully merging this pull request may close these issues.

6 participants