use the lists module for formatting the generic bounds #3680

scampi · 2019-07-12T13:20:26Z

Fix how to extract post comments in a list with separators at the front. Fix extraction of a comment between the type bounds and the opening curly bracket.
Support explicit padding passed through the separator when writing a list.

Close #3669
Close #2055

scampi · 2019-07-12T13:26:53Z

Is the whitespace after + with type_punctuation_density = Compressed intended, i.e., https://github.com/rust-lang/rustfmt/pull/3680/files#diff-dfd26227c4842bd3288e9b1f53f0089fL844 ?

Given it's Compressed, in the current state of the PR the whitespace is removed, i.e.,
https://github.com/rust-lang/rustfmt/pull/3680/files#diff-9015fa417c17e7ba1e7d928f6daef412R1

scampi · 2019-07-16T23:05:13Z

About the comment above, below is the diff against master of tests/target/types_compressed.rs: there was a whitespace added after + at the beginning of each line.

10,47c10,47
< +         + Foo
< +         + Foo
< +         + Foo
< +         + Foo
< +         + Foo
< +         + Foo
< +         + Foo
< +         + Foo
< +         + Foo
< +         + Foo
< +         + Foo
< +         + Foo
< +         + Foo
< +         + Foo
< +         + Foo
< +         + Foo
< +         + Foo
< +         + Foo
< +         + Foo
< +         + Foo
< +         + Foo
< +         + Foo
< +         + Foo
< +         + Foo
< +         + Foo
< +         + Foo
< +         + Foo
< +         + Foo
< +         + Foo
< +         + Foo
< +         + Foo
< +         + Foo
< +         + Foo
< +         + Foo
< +         + Foo
< +         + Foo
< +         + Foo
< +         + 'a+'a+'a+'a+'a {
---
> +         +Foo
> +         +Foo
> +         +Foo
> +         +Foo
> +         +Foo
> +         +Foo
> +         +Foo
> +         +Foo
> +         +Foo
> +         +Foo
> +         +Foo
> +         +Foo
> +         +Foo
> +         +Foo
> +         +Foo
> +         +Foo
> +         +Foo
> +         +Foo
> +         +Foo
> +         +Foo
> +         +Foo
> +         +Foo
> +         +Foo
> +         +Foo
> +         +Foo
> +         +Foo
> +         +Foo
> +         +Foo
> +         +Foo
> +         +Foo
> +         +Foo
> +         +Foo
> +         +Foo
> +         +Foo
> +         +Foo
> +         +Foo
> +         +Foo
> +         +'a+'a+'a+'a+'a {

scampi · 2019-07-23T10:03:29Z

@topecongiro what do you think of the proposed changes ?

topecongiro

My apologies for the late review. The new format when type_punctuation_density is set to Compressed seems good to me.

tests/target/issue-3669.rs

topecongiro · 2019-07-27T07:21:59Z

tests/target/issue-3669.rs

+    + Serialize            // comment8
+    + for<'a> Deserialize<'a> // comment9
+{
+    type DoubleState: Copy                                // Note(Evrey): Because Rust is drunk. 1


Looks like the first comment is not aligned with others. Is this intentional?

the alignement in 3850fb1#diff-11ffc82e7dc3c14ae179a08592fd9c26R28 got fixed but not this one yet, i'll try to see if I can.

It seems that the shape offset is not correctly set: the extra space taken by the type name is not considered by the first item.

Fix how to extract post comments in a list with separators at the front. Fix extraction of a comment between the type bounds and the opening curly bracket. Support explicit padding passed through the separator when writing a list.

…of types spanning multiple lines

…ng post comments

…icate what they are used for

…nds-list

scampi · 2019-09-25T23:07:33Z

@topecongiro sorry for the delay, I have now gated the changes proposed in this PR. Could you give this another look? Thanks!

topecongiro · 2019-10-19T08:35:40Z

tests/target/issue-3669/type_compressed-two.rs

+pub fn do_something<'a, T: Trait1+Trait2+'a>(
+    &fooo: u32,
+) -> impl Foo
+Foo


I think we still want to indent these +Foos even when type_punctuation_density is set to Compressed.

Indenting these +Foo would go against the fix for #3701: https://github.com/rust-lang/rustfmt/pull/3731/files#diff-dfd26227c4842bd3288e9b1f53f0089fR751

rustfmt/src/types.rs

Line 751 in ed7c032

join_bounds(context, shape, it, false)

The false argument instructs join_bounds not to indent; to indent +Foo I would have to pass true instead.

BTW This non-indentation happens regardless of type_punctuation_density.

What should I do here ?

topecongiro · 2020-05-26T13:49:10Z

Closing this due to inactivity; if you have any follow-up, please feel free to reopen this.

rchaser53 mentioned this pull request Jul 14, 2019

fix 'extra comma inserted due to comment' #3677

Merged

scampi marked this pull request as ready for review July 16, 2019 23:54

topecongiro approved these changes Jul 24, 2019

View reviewed changes

tests/target/issue-3669.rs Outdated Show resolved Hide resolved

scampi force-pushed the format-bounds-list branch from e168a45 to 54da77a Compare July 24, 2019 22:51

topecongiro reviewed Jul 27, 2019

View reviewed changes

scampi added 8 commits July 31, 2019 16:41

use the lists module for formatting the generic bounds

7aad919

Fix how to extract post comments in a list with separators at the front. Fix extraction of a comment between the type bounds and the opening curly bracket. Support explicit padding passed through the separator when writing a list.

add tests with type_punctuation_density set to Compressed and a list …

ca9ffcc

…of types spanning multiple lines

clarified logic for formatting the type bounds as a list

2f9357b

trailing newlines in post_comments should be removed

3850fb1

take into consideration the length taken by the separator when aligni…

58ad27c

…ng post comments

extract some write_list variables into separate structs to better ind…

62961be

…icate what they are used for

move item_max_width into the PostCommentAlignment struct

9865ce0

add documentation and clarify some code about list stringification

db09dac

scampi force-pushed the format-bounds-list branch from 54da77a to db09dac Compare July 31, 2019 20:04

scampi mentioned this pull request Aug 6, 2019

version-gate the changes from #3618 and #3632 #3730

Closed

scampi added 3 commits September 21, 2019 00:22

Merge branch 'master' of github.com:rust-lang/rustfmt into format-bou…

8ee296d

…nds-list

fix indent in types_compressed.rs test following #3731

a601c5e

gated the handling of comment in types list

6e2202e

topecongiro reviewed Oct 19, 2019

View reviewed changes

topecongiro added the pr-waiting-on-author label Oct 19, 2019

topecongiro closed this May 26, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

use the lists module for formatting the generic bounds #3680

use the lists module for formatting the generic bounds #3680

scampi commented Jul 12, 2019 •

edited

Loading

scampi commented Jul 12, 2019

scampi commented Jul 16, 2019 •

edited

Loading

scampi commented Jul 23, 2019

topecongiro left a comment

topecongiro Jul 27, 2019

scampi Jul 31, 2019

scampi commented Sep 25, 2019

topecongiro Oct 19, 2019

scampi Oct 26, 2019

topecongiro commented May 26, 2020

use the lists module for formatting the generic bounds #3680

use the lists module for formatting the generic bounds #3680

Conversation

scampi commented Jul 12, 2019 • edited Loading

scampi commented Jul 12, 2019

scampi commented Jul 16, 2019 • edited Loading

scampi commented Jul 23, 2019

topecongiro left a comment

Choose a reason for hiding this comment

topecongiro Jul 27, 2019

Choose a reason for hiding this comment

scampi Jul 31, 2019

Choose a reason for hiding this comment

scampi commented Sep 25, 2019

topecongiro Oct 19, 2019

Choose a reason for hiding this comment

scampi Oct 26, 2019

Choose a reason for hiding this comment

topecongiro commented May 26, 2020

scampi commented Jul 12, 2019 •

edited

Loading

scampi commented Jul 16, 2019 •

edited

Loading