user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Trailing comma on match block goes missing when guard is on its own line

Browse source
This commit is contained in:
Ulyssa 2021-09-15 08:58:23 -07:00 • committed by Caleb Cartwright
parent 7aa69e5bc8
commit dd445aba08
3 changed files with 19 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/matches.rs
View file

@ -409,6 +409,7 @@ fn rewrite_match_body(
}
result.push_str(&nested_indent_str);
result.push_str(&body_str);
result.push_str(&comma);
return Some(result);
}

8
tests/source/match-block-trailing-comma.rs
View file

@ -8,6 +8,14 @@ fn foo() {
"line1";
"line2"
}
ThisIsA::Guard if true => {
"line1";
"line2"
}
ThisIsA::ReallyLongPattern(ThatWillForce::TheGuard, ToWrapOnto::TheFollowingLine) if true => {
"line1";
"line2"
}
b => (aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa,
bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb),
}

10
tests/target/match-block-trailing-comma.rs
View file

@ -8,6 +8,16 @@ fn foo() {
"line1";
"line2"
},
ThisIsA::Guard if true => {
"line1";
"line2"
},
ThisIsA::ReallyLongPattern(ThatWillForce::TheGuard, ToWrapOnto::TheFollowingLine)
if true =>
{
"line1";
"line2"
},
b => (
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa,
bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb,