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

Naked semicolon in an empty body needs to be formatted twice #4627

Closed
al-yisun opened this issue Jan 5, 2021 · 1 comment · Fixed by #4628
Closed

Naked semicolon in an empty body needs to be formatted twice #4627

al-yisun opened this issue Jan 5, 2021 · 1 comment · Fixed by #4628
Labels
1x-backport:completed bug Panic, non-idempotency, invalid code, etc. duplicate
Milestone

Comments

@al-yisun
Copy link

al-yisun commented Jan 5, 2021

loop {
    ;
}

gets formatted to

loop {
}

which then gets formatted to

loop {}

Thus requiring two calls to rustfmt to achieve a stable state.

Expected behavior

loop {
    ;
}

should format in one step to

loop {}

Meta

  • rustfmt version: rustfmt 1.4.29-nightly (70ce1825 2020-12-04)
  • From where did you install rustfmt?: cargo
  • How do you run rustfmt: cargo fmt
@al-yisun al-yisun added the bug Panic, non-idempotency, invalid code, etc. label Jan 5, 2021
@calebcartwright
Copy link
Member

Thanks for the report. This is really a duplicate of #3868 which I'd fixed in source a while ago, but back then we were unable to release/backport the change. That's because at the time the parser/AST didn't give us a way to differentiate between empty tuple expression in a statement position and a standalone semi as an empty statement.

Subsequent enhancements in the parser and AST updates have addressed that though so will clean this up in source and schedule it for an upcoming release.

@calebcartwright calebcartwright added 1x-backport:pending Fixed/resolved in source but not yet backported to a 1x branch and release duplicate labels Jan 7, 2021
@calebcartwright calebcartwright modified the milestones: 1.4.32, 1.4.33 Jan 10, 2021
@calebcartwright calebcartwright added 1x-backport:completed and removed 1x-backport:pending Fixed/resolved in source but not yet backported to a 1x branch and release labels Jan 28, 2021
JohnTitor added a commit to JohnTitor/rust that referenced this issue Jan 30, 2021
…anxiyn

update rustfmt to v1.4.34

Short summary: Various formatting fixes (several const generic related) and introduction of `imports_granularity` config option

Long summary copied from changelog:

#### Changed
- `merge_imports` configuration has been deprecated in favor of the new `imports_granularity` option. Any existing usage of `merge_imports` will be automatically mapped to the corresponding value on `imports_granularity` with a warning message printed to encourage users to update their config files.

#### Added
- New `imports_granularity` option has been added which succeeds `merge_imports`. This new option supports several additional variants which allow users to merge imports at different levels (crate or module), and even flatten imports to have a single use statement per item. ([PR rust-lang/rustfmt#4634](rust-lang/rustfmt#4634), [PR rust-lang/rustfmt#4639](rust-lang/rustfmt#4639))

See the section on the configuration site for more information
https://rust-lang.github.io/rustfmt/?version=v1.4.33&search=#imports_granularity

#### Fixed
- Fix erroneous removal of `const` keyword on const trait impl ([rust-lang/rustfmt#4084](rust-lang/rustfmt#4084))
- Fix incorrect span usage wit const generics in supertraits ([rust-lang/rustfmt#4204](rust-lang/rustfmt#4204))
- Use correct span for const generic params ([rust-lang/rustfmt#4263](rust-lang/rustfmt#4263))
- Correct span on const generics to include type bounds ([rust-lang/rustfmt#4310](rust-lang/rustfmt#4310))
- Idempotence issue on blocks containing only empty statements ([rust-lang/rustfmt#4627](rust-lang/rustfmt#4627) and [rust-lang#3868](rust-lang/rustfmt#3868))
- Fix issue with semicolon placement on required functions that have a trailing comment that ends in a line-style comment before the semicolon ([rust-lang/rustfmt#4646](rust-lang/rustfmt#4646))
- Avoid shared interned cfg_if symbol since rustfmt can re-initialize the rustc_ast globals on multiple inputs ([rust-lang/rustfmt#4656](rust-lang/rustfmt#4656))
- Don't insert trailing comma on (base-less) rest in struct literals within macros ([rust-lang/rustfmt#4675](rust-lang/rustfmt#4675))
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
1x-backport:completed bug Panic, non-idempotency, invalid code, etc. duplicate
Projects
None yet
Development

Successfully merging a pull request may close this issue.

2 participants