Skip to content

Conversation

compiler-errors
Copy link
Member

Reverts #100232, including a few places where there were merge conflicts after this landed.

r? @pnkfelix
cc @cjgillot

cc #103430 the nightly workaround for this issue.

@rustbot
Copy link
Collaborator

rustbot commented Oct 27, 2022

⚠️ 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!

@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 Oct 27, 2022
@rustbot
Copy link
Collaborator

rustbot commented Oct 27, 2022

Some changes occurred in src/tools/clippy

cc @rust-lang/clippy

Some changes occurred in src/tools/rustfmt

cc @rust-lang/rustfmt

@pnkfelix
Copy link
Contributor

LGTM.

@bors r+

@bors
Copy link
Collaborator

bors commented Oct 27, 2022

📌 Commit 4d01f53 has been approved by pnkfelix

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 Oct 27, 2022
@pnkfelix
Copy link
Contributor

The intent here is that this will address the fallout that is documented on issue #103244 with respect to the 1.65 release. PR #103430 is how #103244 will be addressed for 1.66 and beyond (unless something better comes along, of course).

@compiler-errors
Copy link
Member Author

@bors rollup=never p=1

@cjgillot
Copy link
Contributor

Does this PR reopens the ICE in #73663?

@compiler-errors
Copy link
Member Author

compiler-errors commented Oct 27, 2022

@cjgillot, yes but only on beta (-> stable 1.65). Given that it's a bug that already exists on stable, I'm fine with that personally, but perhaps someone else like @pnkfelix or you can weigh in on the risk.

@pnkfelix
Copy link
Contributor

yes, I am also fine with treating #73663 as effectively resolved, due to 1. the fact that the ICE itself has been around since 202 and 2. the fix persisting on nightly even with this revert on beta.

@bors
Copy link
Collaborator

bors commented Oct 28, 2022

⌛ Testing commit 4d01f53 with merge 636a78a...

@bors
Copy link
Collaborator

bors commented Oct 28, 2022

☀️ Test successful - checks-actions
Approved by: pnkfelix
Pushing 636a78a to beta...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Oct 28, 2022
@bors bors merged commit 636a78a into rust-lang:beta Oct 28, 2022
@rustbot rustbot added this to the 1.65.0 milestone Oct 28, 2022
@compiler-errors compiler-errors deleted the beta-revert-rcvr-args-split branch August 11, 2023 19:55
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.

5 participants