Fix brace_style="PreferSameLine" with trailing_comma="Vertical" results

Configurations.md

@@ -243,7 +243,7 @@ fn lorem(ipsum: usize) {
 
 fn lorem<T>(ipsum: T)
 where
-    T: Add + Sub + Mul + Div, {
+    T: Add + Sub + Mul + Div {
     // body
 }
 ```
@@ -290,7 +290,7 @@ struct Lorem {
 
 struct Dolor<T>
 where
-    T: Eq, {
+    T: Eq {
     sit: T,
 }
 ```

src/items.rs

@@ -2751,6 +2751,7 @@ fn rewrite_where_clause_rfc_style(
     span_end: Option<BytePos>,
     span_end_before_where: BytePos,
     where_clause_option: WhereClauseOption,
+    brace_style: BraceStyle,
 ) -> Option<String> {
     let (where_keyword, allow_single_line) = rewrite_where_keyword(
         context,
@@ -2779,6 +2780,7 @@ fn rewrite_where_clause_rfc_style(
         span_end,
         where_clause_option,
         force_single_line,
+        brace_style,
     )?;
 
     // 6 = `where `
@@ -2850,6 +2852,7 @@ fn rewrite_bounds_on_where_clause(
     span_end: Option<BytePos>,
     where_clause_option: WhereClauseOption,
     force_single_line: bool,
+    brace_style: BraceStyle,
 ) -> Option<String> {
     let span_start = predicates[0].span().lo();
     // If we don't have the start of the next span, then use the end of the
@@ -2869,7 +2872,11 @@ fn rewrite_bounds_on_where_clause(
         span_end,
         false,
     );
-    let comma_tactic = if where_clause_option.suppress_comma || force_single_line {
+    let comma_tactic = if where_clause_option.suppress_comma
+        || force_single_line
+        || brace_style == BraceStyle::PreferSameLine
+            && context.config.trailing_comma() == SeparatorTactic::Vertical
+    {
         SeparatorTactic::Never
     } else {
         context.config.trailing_comma()
@@ -2916,6 +2923,7 @@ fn rewrite_where_clause(
             span_end,
             span_end_before_where,
             where_clause_option,
+            brace_style,
         );
     }
 

tests/target/configs/brace_style/fn_prefer_same_line.rs

@@ -11,6 +11,6 @@ fn lorem(ipsum: usize) {
 
 fn lorem<T>(ipsum: T)
 where
-    T: Add + Sub + Mul + Div, {
+    T: Add + Sub + Mul + Div {
     // body
 }

tests/target/configs/brace_style/item_prefer_same_line.rs

@@ -7,7 +7,7 @@ struct Lorem {
 
 struct Dolor<T>
 where
-    T: Eq, {
+    T: Eq {
     sit: T,
 }
 

tests/target/fn-custom-6.rs

@@ -31,7 +31,7 @@ fn bar(
 
 fn foo(a: Aaaaaaaaaaaaaa, b: Bbbbbbbbbbbbbb)
 where
-    T: UUUUUUUUUUU, {
+    T: UUUUUUUUUUU {
     foo();
 }
 
@@ -42,13 +42,13 @@ fn bar(
     d: Dddddddddddddddd,
     e: Eeeeeeeeeeeeeee,
 ) where
-    T: UUUUUUUUUUU, {
+    T: UUUUUUUUUUU {
     bar();
 }
 
 fn foo(a: Aaaaaaaaaaaaaa, b: Bbbbbbbbbbbbbb) -> String
 where
-    T: UUUUUUUUUUU, {
+    T: UUUUUUUUUUU {
     foo();
 }
 
@@ -60,7 +60,7 @@ fn bar(
     e: Eeeeeeeeeeeeeee,
 ) -> String
 where
-    T: UUUUUUUUUUU, {
+    T: UUUUUUUUUUU {
     bar();
 }
 

tests/target/fn-custom-8.rs

@@ -31,7 +31,7 @@ fn bar(
 
 fn foo(a: Aaaaaaaaaaaaaa, b: Bbbbbbbbbbbbbb)
 where
-    T: UUUUUUUUUUU, {
+    T: UUUUUUUUUUU {
     foo();
 }
 
@@ -42,13 +42,13 @@ fn bar(
     d: Dddddddddddddddd,
     e: Eeeeeeeeeeeeeee,
 ) where
-    T: UUUUUUUUUUU, {
+    T: UUUUUUUUUUU {
     bar();
 }
 
 fn foo(a: Aaaaaaaaaaaaaa, b: Bbbbbbbbbbbbbb) -> String
 where
-    T: UUUUUUUUUUU, {
+    T: UUUUUUUUUUU {
     foo();
 }
 
@@ -60,7 +60,7 @@ fn bar(
     e: Eeeeeeeeeeeeeee,
 ) -> String
 where
-    T: UUUUUUUUUUU, {
+    T: UUUUUUUUUUU {
     bar();
 }
 
@@ -72,6 +72,6 @@ trait Test {
     fn bar(a: u8) -> String
     where
         Foo: foooo,
-        Bar: barrr, {
+        Bar: barrr {
     }
 }

tests/target/issue-2321/trailing_comma_always_and_brace_style_always_next_line.rs

@@ -0,0 +1,10 @@
+// rustfmt-brace_style: AlwaysNextLine
+// rustfmt-trailing_comma: Always
+
+fn lorem<S, T,>(lorem: S, ipsum: T,)
+where
+    S: Add + Sub,
+    T: Mul + Div,
+{
+    // body
+}

tests/target/issue-2321/trailing_comma_always_and_brace_style_prefer_same_line.rs

@@ -0,0 +1,9 @@
+// rustfmt-brace_style: PreferSameLine
+// rustfmt-trailing_comma: Always
+
+fn lorem<S, T,>(lorem: S, ipsum: T,)
+where
+    S: Add + Sub,
+    T: Mul + Div, {
+    // body
+}

tests/target/issue-2321/trailing_comma_always_and_brace_style_same_line_where.rs

@@ -0,0 +1,10 @@
+// rustfmt-brace_style: SameLineWhere
+// rustfmt-trailing_comma: Always
+
+fn lorem<S, T,>(lorem: S, ipsum: T,)
+where
+    S: Add + Sub,
+    T: Mul + Div,
+{
+    // body
+}

tests/target/issue-2321/trailing_comma_vertical_and_brace_style_always_next_line.rs

@@ -0,0 +1,10 @@
+// rustfmt-brace_style: AlwaysNextLine
+// rustfmt-trailing_comma: Vertical
+
+fn lorem<S, T>(lorem: S, ipsum: T)
+where
+    S: Add + Sub,
+    T: Mul + Div,
+{
+    // body
+}

tests/target/issue-2321/trailing_comma_vertical_and_brace_style_prefer_same_line.rs

@@ -0,0 +1,9 @@
+// rustfmt-brace_style: PreferSameLine
+// rustfmt-trailing_comma: Vertical
+
+fn lorem<S, T>(lorem: S, ipsum: T)
+where
+    S: Add + Sub,
+    T: Mul + Div {
+    // body
+}

tests/target/issue-2321/trailing_comma_vertical_and_brace_style_same_line_where.rs

@@ -0,0 +1,10 @@
+// rustfmt-brace_style: SameLineWhere
+// rustfmt-trailing_comma: Vertical
+
+fn lorem<S, T>(lorem: S, ipsum: T)
+where
+    S: Add + Sub,
+    T: Mul + Div,
+{
+    // body
+}

tests/target/item-brace-style-prefer-same-line.rs

@@ -15,21 +15,21 @@ mod M {
 
     enum A<T>
     where
-        T: Copy, {
+        T: Copy {
         A,
     }
 
     struct B<T>
     where
-        T: Copy, {
+        T: Copy {
         b: i32,
     }
 
     enum C<T>
     where
-        T: Copy, {}
+        T: Copy {}
 
     struct D<T>
     where
-        T: Copy, {}
+        T: Copy {}
 }