revert previous fix

Author: lukewilson2002

src/items.rs

@@ -2758,12 +2758,8 @@ fn rewrite_fn_base(
 
     let ends_with_comment = last_line_contains_single_line_comment(&result);
     force_new_line_for_brace |= ends_with_comment;
-
-    // PreferSameLine should keep the brace on the same line as the last where predicate.
-    force_new_line_for_brace |= !where_clause_str.is_empty()
-        && context.config.where_single_line()
-        && is_params_multi_lined
-        && context.config.brace_style() != BraceStyle::PreferSameLine;
+    force_new_line_for_brace |=
+        is_params_multi_lined && context.config.where_single_line() && !where_clause_str.is_empty();
 
     Ok((result, ends_with_comment, force_new_line_for_brace))
 }

tests/target/issue-6539/prefer_same_line_where_single_line.rs

@@ -111,7 +111,8 @@ fn fn_with_everything_long_and_body<T, U, 'a>(
 >
 where
     T: Debug + Display + Clone + Send + Sync + 'static,
-    U: Iterator<Item = &'a T> + ExactSizeIterator, {
+    U: Iterator<Item = &'a T> + ExactSizeIterator,
+{
 }
 
 // Trait methods
@@ -216,6 +217,7 @@ pub trait Trait {
     >
     where
         T: Debug + Display + Clone + Send + Sync + 'static,
-        U: Iterator<Item = &'a T> + ExactSizeIterator, {
+        U: Iterator<Item = &'a T> + ExactSizeIterator,
+    {
     }
 }