Skip to content

Commit dd445ab

Browse files
ulyssacalebcartwright
authored andcommitted
Trailing comma on match block goes missing when guard is on its own line
1 parent 7aa69e5 commit dd445ab

File tree

3 files changed

+19
-0
lines changed

3 files changed

+19
-0
lines changed

src/matches.rs

+1
Original file line numberDiff line numberDiff line change
@@ -409,6 +409,7 @@ fn rewrite_match_body(
409409
}
410410
result.push_str(&nested_indent_str);
411411
result.push_str(&body_str);
412+
result.push_str(&comma);
412413
return Some(result);
413414
}
414415

tests/source/match-block-trailing-comma.rs

+8
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,14 @@ fn foo() {
88
"line1";
99
"line2"
1010
}
11+
ThisIsA::Guard if true => {
12+
"line1";
13+
"line2"
14+
}
15+
ThisIsA::ReallyLongPattern(ThatWillForce::TheGuard, ToWrapOnto::TheFollowingLine) if true => {
16+
"line1";
17+
"line2"
18+
}
1119
b => (aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa,
1220
bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb),
1321
}

tests/target/match-block-trailing-comma.rs

+10
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,16 @@ fn foo() {
88
"line1";
99
"line2"
1010
},
11+
ThisIsA::Guard if true => {
12+
"line1";
13+
"line2"
14+
},
15+
ThisIsA::ReallyLongPattern(ThatWillForce::TheGuard, ToWrapOnto::TheFollowingLine)
16+
if true =>
17+
{
18+
"line1";
19+
"line2"
20+
},
1121
b => (
1222
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa,
1323
bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb,

0 commit comments

Comments
 (0)