Skip to content

Fix diverging_sub_expression not checking body of block #10785

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 5 commits into from
Jun 10, 2023

Conversation

Centri3
Copy link
Member

@Centri3 Centri3 commented May 15, 2023

Fixes #10776

This also adds a warning to the test ui/never_loop.rs, not sure if this is correct or not.

changelog: [diverging_sub_expression]: Fix false negatives with body of block

@rustbot
Copy link
Collaborator

rustbot commented May 15, 2023

r? @Jarcho

(rustbot has picked a reviewer for you, use r? to override)

@rustbot rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties label May 15, 2023
@bors
Copy link
Contributor

bors commented May 20, 2023

☔ The latest upstream changes (presumably #10802) made this pull request unmergeable. Please resolve the merge conflicts.

@Jarcho
Copy link
Contributor

Jarcho commented May 23, 2023

Clippy has a no merge commit policy. You'll have to rebase your changes instead.

@Centri3 Centri3 force-pushed the diverting_sub_expression branch from 5882252 to 0894a9d Compare May 23, 2023 05:44
@Centri3
Copy link
Member Author

Centri3 commented May 23, 2023

Clippy has a no merge commit policy. You'll have to rebase your changes instead.

Could've sworn I did that the first time, not sure what I did. I guess it's clear now I have no idea what I'm doing 😄

@Jarcho
Copy link
Contributor

Jarcho commented Jun 9, 2023

Feel free to squash after fixing the last little nit.

Centri3 added 2 commits June 9, 2023 11:44
Update mixed_read_write_in_expression.rs

Update diverging_sub_expression.stderr
@Centri3 Centri3 force-pushed the diverting_sub_expression branch from 8ee9598 to c1c134a Compare June 9, 2023 16:45
@Jarcho
Copy link
Contributor

Jarcho commented Jun 10, 2023

Thank you. @bors r+

@bors
Copy link
Contributor

bors commented Jun 10, 2023

📌 Commit 35aff1a has been approved by Jarcho

It is now in the queue for this repository.

@bors
Copy link
Contributor

bors commented Jun 10, 2023

⌛ Testing commit 35aff1a with merge d44ea7c...

@bors
Copy link
Contributor

bors commented Jun 10, 2023

☀️ Test successful - checks-action_dev_test, checks-action_remark_test, checks-action_test
Approved by: Jarcho
Pushing d44ea7c to master...

@bors bors merged commit d44ea7c into rust-lang:master Jun 10, 2023
@Centri3 Centri3 deleted the diverting_sub_expression branch June 10, 2023 14:53
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
S-waiting-on-review Status: Awaiting review from the assignee but also interested parties
Projects
None yet
Development

Successfully merging this pull request may close these issues.

diverging_sub_expression false negative on diverging body of block
4 participants