Skip to content

Commit a57d57b

Browse files
kevinjiytmimi
authored andcommitted
Remove newlines in where clauses for v2
Fixes #5655.
1 parent 4b01e62 commit a57d57b

File tree

5 files changed

+38
-1
lines changed

5 files changed

+38
-1
lines changed

Diff for: src/items.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -2996,10 +2996,12 @@ fn rewrite_bounds_on_where_clause(
29962996
DefinitiveListTactic::Vertical
29972997
};
29982998

2999+
let preserve_newline = context.config.version() == Version::One;
3000+
29993001
let fmt = ListFormatting::new(shape, context.config)
30003002
.tactic(shape_tactic)
30013003
.trailing_separator(comma_tactic)
3002-
.preserve_newline(true);
3004+
.preserve_newline(preserve_newline);
30033005
write_list(&items.collect::<Vec<_>>(), &fmt)
30043006
}
30053007

Diff for: tests/source/issue-5655/one.rs

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
// rustfmt-version: One
2+
3+
fn foo<T>(_: T)
4+
where
5+
T: std::fmt::Debug,
6+
7+
T: std::fmt::Display,
8+
{
9+
}

Diff for: tests/source/issue-5655/two.rs

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
// rustfmt-version: Two
2+
3+
fn foo<T>(_: T)
4+
where
5+
T: std::fmt::Debug,
6+
7+
T: std::fmt::Display,
8+
{
9+
}

Diff for: tests/target/issue-5655/one.rs

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
// rustfmt-version: One
2+
3+
fn foo<T>(_: T)
4+
where
5+
T: std::fmt::Debug,
6+
7+
T: std::fmt::Display,
8+
{
9+
}

Diff for: tests/target/issue-5655/two.rs

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
// rustfmt-version: Two
2+
3+
fn foo<T>(_: T)
4+
where
5+
T: std::fmt::Debug,
6+
T: std::fmt::Display,
7+
{
8+
}

0 commit comments

Comments
 (0)