Merge pull request rust-lang#3306 from topecongiro/issue-2841

Do not force trailing comma when using mixed layout

Author: topecongiro

Cargo.lock

@@ -607,9 +607,6 @@ impl<'a> Context<'a> {
             tactic
         } else if !self.context.use_block_indent() {
             SeparatorTactic::Never
-        } else if tactic == DefinitiveListTactic::Mixed {
-            // We are using mixed layout because everything did not fit within a single line.
-            SeparatorTactic::Always
         } else {
             self.context.config.trailing_comma()
         };

src/overflow.rs

@@ -39,3 +39,7 @@ enum StructY {
         i: i32,
     }
 }
+
+static XXX: [i8; 64] = [
+1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,1, 1, 1,
+];

tests/source/trailing-comma-never.rs

@@ -29,3 +29,7 @@ enum StructY {
     A { s: u16 },
     B { u: u32, i: i32 }
 }
+
+static XXX: [i8; 64] = [
+    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1
+];