diff options
| author | bors <bors@rust-lang.org> | 2023-07-28 06:46:51 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-07-28 06:46:51 +0000 |
| commit | 37343f4a4d4ed7ad0891cb79e8eb25acf43fb821 (patch) | |
| tree | d15d5ba1ba71d0abfc73e4d7208080aa03e22027 | |
| parent | e40e22be550fdcf5f11ba95cc84f3f337b0695f4 (diff) | |
| parent | 45b2559e5e56157cb1d56f02e52caa33372b1832 (diff) | |
Auto merge of #114154 - calebcartwright:style-match-mac, r=joshtriplett
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 https://github.com/rust-lang/style-team/pull/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`
| -rw-r--r-- | src/doc/style-guide/src/expressions.md | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/doc/style-guide/src/expressions.md b/src/doc/style-guide/src/expressions.md index bf3fe87a0a4..f0c2a189f12 100644 --- a/src/doc/style-guide/src/expressions.md +++ b/src/doc/style-guide/src/expressions.md @@ -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. @@ -686,6 +687,10 @@ match foo { bar => {} // Trailing comma on last item. foo => bar, + baz => qux!(), + lorem => { + ipsum!() + } } ``` |
