Do not normalize vertical spaces unless they are between items #4295
Conversation
- We no longer normalize number of vertical spaces between statements. - Add a test
| @@ -7,24 +7,28 @@ fn main() { | |||
| let bar = (); | |||
| } | |||
|
|
|||
|
|
|||
There was a problem hiding this comment.
I am adding blank lines to this and subsequent targets to match the number of blank lines in the corresponding source.
| @@ -63,13 +64,15 @@ impl<'a> FmtVisitor<'a> { | |||
| } | |||
| let indent = this.block_indent.to_string(config); | |||
| this.push_str(&indent); | |||
| }) | |||
| }); | |||
| self.normalize_vertical_spaces = false; | |||
There was a problem hiding this comment.
Sorry for the borderline pun, but could we normalize the variable/function names and replace the old vertical_spaces with newline consistently everywhere?
| self.normalize_vertical_spaces = false; | |
| self.normalize_newline_counts = false; |
| newline_count | ||
| } | ||
|
|
||
| fn push_vertical_spaces(&mut self, mut newline_count: usize) { |
There was a problem hiding this comment.
| fn push_vertical_spaces(&mut self, mut newline_count: usize) { | |
| fn push_newlines(&mut self, mut newline_count: usize) { |
|
I'm running the latest nightly rust and formatting files using |
|
@dcow You're not doing anything wrong. This PR was merged into the There are a bunch of other backport-triage PRs that need to be looked at. Some are simple cherry-picks, but others are more involved due to the two branches diverging. Others are complicated by the fact that they were introduced at a time where a major version of rustfmt was in the works (now on pause) so they could more liberally introduce breaking changes for the new release, which we need to be mindful of when trying to backport them into 1.x branch. That being said, if you're still having issues I'd suggest opening up a new issue with a short code snippet that we can use to reproduce your issue, and one that we can test against 1.x and the |
With this PR, we no longer normalize the number of vertical lines unless those are in between items.
Since this PR changes the default formatting style, I would like to include this PR to the 2.0 release.
Close #2954.