fix: skip brace style for where clause in compute_budgets_for_params + tests for issue 6539

Author: lukewilson2002

src/items.rs

@@ -2500,6 +2500,7 @@ fn rewrite_fn_base(
         ret_str_len,
         fn_brace_style,
         multi_line_ret_str,
+        where_clause,
     );
 
     debug!(
@@ -2899,6 +2900,7 @@ fn compute_budgets_for_params(
     ret_str_len: usize,
     fn_brace_style: FnBraceStyle,
     force_vertical_layout: bool,
+    where_clause: &ast::WhereClause,
 ) -> (usize, usize, Indent) {
     debug!(
         "compute_budgets_for_params {} {:?}, {}, {:?}",
@@ -2913,7 +2915,15 @@ fn compute_budgets_for_params(
         let overhead = if ret_str_len == 0 { 2 } else { 3 };
         let mut used_space = indent.width() + result.len() + ret_str_len + overhead;
         match fn_brace_style {
-            FnBraceStyle::None => used_space += 1,     // 1 = `;`
+            _ if context.config.style_edition() >= StyleEdition::Edition2027
+                && where_clause.predicates.len() > 0 =>
+            {
+                // Don't add anything to `used_space` if we have a where clause.
+                // For all `FnBraceStyle` values if we have a where cluase that can't fit
+                // on the current line it'll be written to the next line.
+                // Therefore, we don't need to account for a trailing `;` or `{}`
+            }
+            FnBraceStyle::None => used_space += 1, // 1 = `;`
             FnBraceStyle::SameLine => used_space += 2, // 2 = `{}`
             FnBraceStyle::NextLine => (),
         }

tests/source/issue-6539/brace_next_line.rs

@@ -0,0 +1,16 @@
+// rustfmt-style_edition: 2027
+// rustfmt-brace_style: AlwaysNextLine
+// rustfmt-where_single_line: false
+
+pub trait Trait
+{
+    fn a_one_hundred_column_fn_decl_no_body(&self, aaa: f64, b: f64, c: f64, d: f64, e: f64) -> f64;
+
+    fn an_over_one_hundred_column_fn_decl_no_body_and_where_clause<T>(&self, a: T, bb: f64) -> f64 where T: Debug;
+
+    fn an_over_one_hundred_column_fn_decl_no_body_and_where_clause2<T>(&self, aaa: T, bbb: f64) -> f64 where T: Debug;
+
+    fn an_over_one_hundred_column_fn_decl_with_body(&self, aaaaa: f64, bbbbb: f64, ccc: f64) -> f64 {}
+
+    fn an_over_one_hundred_column_fn_decl_with_body_and_where_clause<T>(&self, aaaaa: f64) -> f64 where T: Debug {}
+}

tests/source/issue-6539/brace_next_line_where_single_line.rs

@@ -0,0 +1,16 @@
+// rustfmt-style_edition: 2027
+// rustfmt-brace_style: AlwaysNextLine
+// rustfmt-where_single_line: true
+
+pub trait Trait
+{
+    fn a_one_hundred_column_fn_decl_no_body(&self, aaa: f64, b: f64, c: f64, d: f64, e: f64) -> f64;
+
+    fn an_over_one_hundred_column_fn_decl_no_body_and_where_clause<T>(&self, a: T, bb: f64) -> f64 where T: Debug;
+
+    fn an_over_one_hundred_column_fn_decl_no_body_and_where_clause2<T>(&self, aaa: T, bbb: f64) -> f64 where T: Debug;
+
+    fn an_over_one_hundred_column_fn_decl_with_body(&self, aaaaa: f64, bbbbb: f64, ccc: f64) -> f64 {}
+
+    fn an_over_one_hundred_column_fn_decl_with_body_and_where_clause<T>(&self, aaaaa: f64) -> f64 where T: Debug {}
+}

tests/source/issue-6539/default.rs

@@ -0,0 +1,15 @@
+// rustfmt-style_edition: 2027
+
+pub trait Trait {
+    fn a_one_hundred_column_fn_decl_no_body(&self, aaa: f64, b: f64, c: f64, d: f64, e: f64) -> f64;
+
+    fn a_one_hundred_one_column_fn_decl_no_body(self, a: f64, b: f64, c: f64, d: f64, e: f64) -> f64;
+
+    fn an_over_one_hundred_column_fn_decl_no_body_and_where_clause<T>(&self, a: T, bb: f64) -> f64 where T: Debug;
+
+    fn an_over_one_hundred_column_fn_decl_no_body_and_where_clause2<T>(&self, aaa: T, bbb: f64) -> f64 where T: Debug;
+
+    fn an_over_one_hundred_column_fn_decl_with_body(&self, aaaaa: f64, bbbbb: f64, ccc: f64) -> f64 {}
+
+    fn an_over_one_hundred_column_fn_decl_with_body_and_where_clause<T>(&self, aaaaa: f64) -> f64 where T: Debug {}
+}

tests/source/issue-6539/issue_example.rs

@@ -0,0 +1,30 @@
+// rustfmt-style_edition: 2027
+// rustfmt-brace_style: AlwaysNextLine
+// rustfmt-where_single_line: false
+
+pub trait Trait
+{
+    fn a_one_hundred_column_fn_decl_no_body(&self, aaa: f64, b: f64, c: f64, d: f64, e: f64) -> f64;
+
+    fn an_over_one_hundred_column_fn_decl_no_body_and_where_clause<T>(&self, a: T, bb: f64) -> f64
+    where
+        T: Debug;
+
+    fn an_over_one_hundred_column_fn_decl_no_body_and_where_clause2<T>(
+        &self,
+        aaa: T,
+        bbb: f64,
+    ) -> f64
+    where
+        T: Debug;
+
+    fn an_over_one_hundred_column_fn_decl_with_body(&self, aaaaa: f64, bbbbb: f64, ccc: f64) -> f64
+    {
+    }
+
+    fn an_over_one_hundred_column_fn_decl_with_body_and_where_clause<T>(&self, aaaaa: f64) -> f64
+    where
+        T: Debug,
+    {
+    }
+}

tests/target/issue-6539/brace_next_line.rs

@@ -0,0 +1,28 @@
+// rustfmt-style_edition: 2027
+// rustfmt-brace_style: AlwaysNextLine
+// rustfmt-where_single_line: true
+
+pub trait Trait
+{
+    fn a_one_hundred_column_fn_decl_no_body(&self, aaa: f64, b: f64, c: f64, d: f64, e: f64) -> f64;
+
+    fn an_over_one_hundred_column_fn_decl_no_body_and_where_clause<T>(&self, a: T, bb: f64) -> f64
+    where T: Debug;
+
+    fn an_over_one_hundred_column_fn_decl_no_body_and_where_clause2<T>(
+        &self,
+        aaa: T,
+        bbb: f64,
+    ) -> f64
+    where
+        T: Debug;
+
+    fn an_over_one_hundred_column_fn_decl_with_body(&self, aaaaa: f64, bbbbb: f64, ccc: f64) -> f64
+    {
+    }
+
+    fn an_over_one_hundred_column_fn_decl_with_body_and_where_clause<T>(&self, aaaaa: f64) -> f64
+    where T: Debug
+    {
+    }
+}

tests/target/issue-6539/brace_next_line_where_single_line.rs

@@ -0,0 +1,40 @@
+// rustfmt-style_edition: 2027
+
+pub trait Trait {
+    fn a_one_hundred_column_fn_decl_no_body(&self, aaa: f64, b: f64, c: f64, d: f64, e: f64) -> f64;
+
+    fn a_one_hundred_one_column_fn_decl_no_body(
+        self,
+        a: f64,
+        b: f64,
+        c: f64,
+        d: f64,
+        e: f64,
+    ) -> f64;
+
+    fn an_over_one_hundred_column_fn_decl_no_body_and_where_clause<T>(&self, a: T, bb: f64) -> f64
+    where
+        T: Debug;
+
+    fn an_over_one_hundred_column_fn_decl_no_body_and_where_clause2<T>(
+        &self,
+        aaa: T,
+        bbb: f64,
+    ) -> f64
+    where
+        T: Debug;
+
+    fn an_over_one_hundred_column_fn_decl_with_body(
+        &self,
+        aaaaa: f64,
+        bbbbb: f64,
+        ccc: f64,
+    ) -> f64 {
+    }
+
+    fn an_over_one_hundred_column_fn_decl_with_body_and_where_clause<T>(&self, aaaaa: f64) -> f64
+    where
+        T: Debug,
+    {
+    }
+}