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

fix: don't use control flow when extracted fn contains tail expr of original fn #15250

Merged

Conversation

lowr
Copy link
Contributor

@lowr lowr commented Jul 10, 2023

Fixes #10113
Fixes #15061

@rustbot rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 10, 2023
@DropDemBits
Copy link
Contributor

Wondering if this fixes #10113 as well, since the function body there also looks similar.

@lowr
Copy link
Contributor Author

lowr commented Jul 11, 2023

It does! Thanks for noticing and sorry it took so long to fix this 🙏

@lowr
Copy link
Contributor Author

lowr commented Aug 6, 2023

I was going to refactor stuffs a bit because the code for this assist is quite messy, but I don't think I have time for this unfortunately. Marking as ready for review since the fix itself should be good to go.

@lowr lowr marked this pull request as ready for review August 6, 2023 16:10
@Veykril
Copy link
Member

Veykril commented Aug 8, 2023

@bors r+

@bors
Copy link
Collaborator

bors commented Aug 8, 2023

📌 Commit 595d9e6 has been approved by Veykril

It is now in the queue for this repository.

@bors
Copy link
Collaborator

bors commented Aug 8, 2023

⌛ Testing commit 595d9e6 with merge 783130b...

@bors
Copy link
Collaborator

bors commented Aug 8, 2023

☀️ Test successful - checks-actions
Approved by: Veykril
Pushing 783130b to master...

@bors bors merged commit 783130b into rust-lang:master Aug 8, 2023
10 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-review Status: Awaiting review from the assignee but also interested parties.
Projects
None yet
5 participants