Trait Implementation - Adds a newline before the last brace on impls without a body if the first brace is also on a newline #3050
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
andrehjr
force-pushed
the
empty-impl-body-with-braces-newline
branch
from
849ebf4 to
0d6f2ad
Compare
scampi
reviewed
Sep 26, 2018
src/items.rs
Outdated
| @@ -757,9 +757,12 @@ pub fn format_impl( | |||
| result.push_str(&outer_indent_str); | |||
| } | |||
|
|
|||
| if result.ends_with('{') && !context.config.empty_item_single_line() { | |||
| if result.ends_with('{') | |||
| && (!context.config.empty_item_single_line() || trimmed_last_line_width(&result) == 1) | |||
There was a problem hiding this comment.
I think you can reuse the variable need_newline https://github.com/rust-lang-nursery/rustfmt/pull/3050/files#diff-5db152a52bdaeae9dacd35f43a4a78ddR722 which is true if a newline before { was needed.
There was a problem hiding this comment.
Thanks for the tip! True. It's possible to reuse need_newline here, and that made the code much simpler.
Adds a newline before the last brace on impls without a body if the first brace is also on a newline
andrehjr
force-pushed
the
empty-impl-body-with-braces-newline
branch
from
0d6f2ad to
2727d41
Compare
|
Thanks! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Hi there, this is my first PR :) Let me know if there's a better way to fix this.
This PRs ends up bypassing the 'empty_item_single_line' configuration when the
{is on a new line. (related to #2771).According to the comments from #3046, this is the expected behavior. Fixes #3046