Skip to content

clean-up semicolon_inside_block #15390

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 1 commit into from
Aug 4, 2025
Merged

clean-up semicolon_inside_block #15390

merged 1 commit into from
Aug 4, 2025

Conversation

@ada4a
Copy link
Contributor

@ada4a ada4a commented Aug 2, 2025

changelog: none

@rustbot
Copy link
Collaborator

rustbot commented Aug 2, 2025

r? @dswij

rustbot has assigned @dswij.
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 rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties label Aug 2, 2025
@ada4a ada4a mentioned this pull request Aug 2, 2025
Closed
samueltardieu
samueltardieu requested changes Aug 3, 2025
View reviewed changes
Copy link
Member

@samueltardieu samueltardieu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

r? samueltardieu

@rustbot rustbot assigned samueltardieu and unassigned dswij Aug 3, 2025
@rustbot

This comment has been minimized.

Sign in to view
@ada4a ada4a force-pushed the cleanup-semicolon-inside-block branch from 7bbc16d to 41dd38a Compare August 3, 2025 22:48
samueltardieu
samueltardieu requested changes Aug 3, 2025
View reviewed changes
Copy link
Member

@samueltardieu samueltardieu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM after squashing

@rustbot rustbot added S-waiting-on-author Status: This is awaiting some action from the author. (Use `@rustbot ready` to update this status) and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties labels Aug 3, 2025
@ada4a @samueltardieu
clean-up semicolon_inside_block
1fc5e81 
match on `StmtKind` directly

use a let-chain

break up match for a nicer let-chain

shorten `get_line`

move `expr` check down in the inside case as well

for consistency

use `shrink_to_hi`

Apply suggestion

Co-authored-by: Samuel Tardieu <[email protected]>
@ada4a ada4a force-pushed the cleanup-semicolon-inside-block branch from 41dd38a to 1fc5e81 Compare August 3, 2025 22:54
@ada4a
Copy link
Contributor Author

ada4a commented Aug 3, 2025

@rustbot ready

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties and removed S-waiting-on-author Status: This is awaiting some action from the author. (Use `@rustbot ready` to update this status) labels Aug 3, 2025
@samueltardieu samueltardieu enabled auto-merge August 3, 2025 22:56
@ada4a ada4a requested a review from samueltardieu August 4, 2025 08:54
@ada4a
Copy link
Contributor Author

ada4a commented Aug 4, 2025

the auto-merge won't start without the change request being addressed..

@samueltardieu samueltardieu added this pull request to the merge queue Aug 4, 2025
Merged via the queue into rust-lang:master with commit 2b9fb32 Aug 4, 2025
11 checks passed
@rustbot rustbot removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties label Aug 4, 2025
@ada4a ada4a deleted the cleanup-semicolon-inside-block branch August 4, 2025 09:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@samueltardieu samueltardieu samueltardieu approved these changes

Assignees

@samueltardieu samueltardieu

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@ada4a @rustbot @samueltardieu @dswij