Fix last comment for visually formatted struct lits

diff --git a/src/expr.rs b/src/expr.rs
index 29d6d32c0dd47af356b37729bda312504daea07d..6a34257eca3db84baa651559802547811d23dfb6 100644 (file)
--- a/src/expr.rs
+++ b/src/expr.rs
@@ -1364,6 +1364,9 @@ enum StructLitField<'a> {
         _ => 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 @@ enum StructLitField<'a> {
         },
         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));

diff --git a/tests/source/struct_lits_visual.rs b/tests/source/struct_lits_visual.rs
index f483b08b625305e05fbd6360f0bcb740ac487a65..c7534eff7cb88cb7b0483c95416fd0c6d160c1bb 100644 (file)
--- a/tests/source/struct_lits_visual.rs
+++ b/tests/source/struct_lits_visual.rs
@@ -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(),

diff --git a/tests/target/struct_lits_visual.rs b/tests/target/struct_lits_visual.rs
index 5ebc3a8684f0e6834fa6527e69f3e01bcf4ec92d..d5978c3debbe94dc9cbcd5b77b4431cbb4b4d698 100644 (file)
--- a/tests/target/struct_lits_visual.rs
+++ b/tests/target/struct_lits_visual.rs
@@ -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.