Skip to content

Commit 0037862

Browse files
meiomorphismcalebcartwright
authored andcommitted
fix: don't force a newline after an empty where clause
Fixes #4547.
1 parent 073cc38 commit 0037862

File tree

2 files changed

+24
-1
lines changed

2 files changed

+24
-1
lines changed

Diff for: src/items.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -2418,7 +2418,8 @@ fn rewrite_fn_base(
24182418
result.push_str(&where_clause_str);
24192419

24202420
force_new_line_for_brace |= last_line_contains_single_line_comment(&result);
2421-
force_new_line_for_brace |= is_params_multi_lined && context.config.where_single_line();
2421+
force_new_line_for_brace |=
2422+
is_params_multi_lined && context.config.where_single_line() && !where_clause_str.is_empty();
24222423
Some((result, force_new_line_for_brace))
24232424
}
24242425

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
// rustfmt-brace_style: SameLineWhere
2+
// rustfmt-where_single_line: true
3+
4+
fn lorem_multi_line_clauseless<Ipsum, Dolor, Sit, Amet>(
5+
a: Aaaaaaaaaaaaaaa,
6+
b: Bbbbbbbbbbbbbbbb,
7+
c: Ccccccccccccccccc,
8+
d: Ddddddddddddddddddddddddd,
9+
e: Eeeeeeeeeeeeeeeeeee,
10+
) -> T {
11+
// body
12+
}
13+
14+
fn lorem_multi_line_clauseless<Ipsum, Dolor, Sit, Amet>(
15+
a: Aaaaaaaaaaaaaaa,
16+
b: Bbbbbbbbbbbbbbbb,
17+
c: Ccccccccccccccccc,
18+
d: Ddddddddddddddddddddddddd,
19+
e: Eeeeeeeeeeeeeeeeeee,
20+
) {
21+
// body
22+
}

0 commit comments

Comments
 (0)