Skip to content

Commit

Permalink
Auto merge of #114154 - calebcartwright:style-match-mac, r=joshtriplett
Browse files Browse the repository at this point in the history
style-guide: don't flatten match arms with macro call

This pulls forward the gist of the text that was added to the style guide in rust-lang/style-team#159 to account for needing to tweak/soften rustfmt's behavior based on the style guide prescriptions.

There were a few options I considered, noted below, and although I don't particularly love any of them, I felt this was the lesser of the evils.

r? `@joshtriplett`
  • Loading branch information
bors committed Jul 28, 2023
2 parents e40e22b + 45b2559 commit 37343f4
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion src/doc/style-guide/src/expressions.md
Original file line number Diff line number Diff line change
Expand Up @@ -663,7 +663,8 @@ never use a block (unless the block is empty).

If the right-hand side consists of multiple statements, or has line comments,
or the start of the line does not fit on the same line as the left-hand side,
use a block.
use a block. Do not flatten a right-hand side block containing a single macro call
because its expanded form could contain a trailing semicolon.

Block-indent the body of a block arm.

Expand All @@ -686,6 +687,10 @@ match foo {
bar => {}
// Trailing comma on last item.
foo => bar,
baz => qux!(),
lorem => {
ipsum!()
}
}
```

Expand Down

0 comments on commit 37343f4

Please sign in to comment.