Merge pull request #638 from marcusklaas/visual-struct-last-comment
Fix last comment for visually formatted struct lits
This commit is contained in:
commit
b9832f2e9f
@ -1364,6 +1364,9 @@ fn rewrite_struct_lit<'a>(context: &RewriteContext,
|
||||
_ => v_budget,
|
||||
};
|
||||
|
||||
let ends_with_newline = context.config.struct_lit_style != StructLitStyle::Visual &&
|
||||
tactic == DefinitiveListTactic::Vertical;
|
||||
|
||||
let fmt = ListFormatting {
|
||||
tactic: tactic,
|
||||
separator: ",",
|
||||
@ -1374,11 +1377,7 @@ fn rewrite_struct_lit<'a>(context: &RewriteContext,
|
||||
},
|
||||
indent: indent,
|
||||
width: budget,
|
||||
ends_with_newline: match tactic {
|
||||
DefinitiveListTactic::Horizontal => false,
|
||||
DefinitiveListTactic::Vertical => true,
|
||||
DefinitiveListTactic::Mixed => unreachable!(),
|
||||
},
|
||||
ends_with_newline: ends_with_newline,
|
||||
config: context.config,
|
||||
};
|
||||
let fields_str = try_opt!(write_list(&item_vec, &fmt));
|
||||
|
@ -25,6 +25,9 @@ fn main() {
|
||||
|
||||
Quux { x: if cond { bar(); }, y: baz() };
|
||||
|
||||
Baz { x: yxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx, z: zzzzz // test
|
||||
};
|
||||
|
||||
A {
|
||||
// Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec a diam lectus. Sed sit amet ipsum mauris. Maecenas congue ligula ac quam viverra nec consectetur ante hendrerit. Donec et mollis dolor.
|
||||
first: item(),
|
||||
|
@ -42,6 +42,9 @@ fn main() {
|
||||
},
|
||||
y: baz(), };
|
||||
|
||||
Baz { x: yxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx,
|
||||
z: zzzzz, /* test */ };
|
||||
|
||||
A { // Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec a diam lectus. Sed sit
|
||||
// amet ipsum mauris. Maecenas congue ligula ac quam viverra nec consectetur ante
|
||||
// hendrerit. Donec et mollis dolor.
|
||||
|
Loading…
x
Reference in New Issue
Block a user