Split long fields in structs #1424
Conversation
src/items.rs
Outdated
| .rewrite(context, | ||
| Shape::legacy(budget, shape.indent + last_line_width)); | ||
| match type_rewrite { | ||
| Some(ty) => { |
There was a problem hiding this comment.
we should check here to see if there are linebreaks in ty, if so, then we should take the other branch (because we prefer to split at the : rather than in the type.
There was a problem hiding this comment.
@nrc Thank you for you feedbacks!
I have a question here, is it better to format in the following way?
In the first struct its field does not exceed 100 letters, but contains linebreaks.
struct Deep {
deeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeep: node::Handle<IdRef<'id, Node<K, V>>,
Type,
NodeType>to
struct Deep {
deeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeep:
node::Handle<IdRef<'id, Node<K, V>>, Type, NodeType>,
}
src/items.rs
Outdated
| type_offset.to_string(&context.config), | ||
| s) | ||
| })); | ||
| Some(result + &type_rewrite) |
There was a problem hiding this comment.
I think this code could be simpler, rather than map the rewrite, you could make the returned value Some(format!({}\n{}{}), result, type_offset.to_string(...), type_rewrite)
tests/target/structs.rs
Outdated
| the_quick_brown_fox_jumps_over_the_lazy_dog: | ||
| AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA, | ||
| } | ||
| } |
There was a problem hiding this comment.
Could you add a test where the type is split across multiple lines please?
tests/target/structs.rs
Outdated
|
|
||
| mod long_struct { | ||
| type A = i32; | ||
| type AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA = i32; |
There was a problem hiding this comment.
You don't need these - rustfmt tests don't need to compile, only parse
topecongiro
force-pushed
the
long-struct
branch
from
abd891b
to
8cc3072
Compare
|
Rebased. |
src/items.rs
Outdated
| .rewrite(context, | ||
| Shape::legacy(budget, shape.indent + last_line_width)) { | ||
| Some(ty) => { | ||
| if ty.contains('\n') { |
There was a problem hiding this comment.
Could you guard the match arm with this, rather have an if block?
This commit splits long fields in structs. Closes rust-lang#1412.
topecongiro
force-pushed
the
long-struct
branch
from
8cc3072
to
3a1ffa7
Compare
|
Thank you! |
Closes #1412.