Do not force trailing comma when using mixed layout

jorickert · Jan 31, 2019 · 154ccf6 · 154ccf6
1 parent 923da60
commit 154ccf6
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 3 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/src/overflow.rs b/src/overflow.rs
@@ -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()
         };

diff --git a/tests/source/trailing-comma-never.rs b/tests/source/trailing-comma-never.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,
+];
diff --git a/tests/target/trailing-comma-never.rs b/tests/target/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
+];
-Original file line number
+Diff line change
@@ Expand Up / @@ -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,
+    ];