diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2023-12-23 16:23:54 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-23 16:23:54 +0100 |
| commit | bdc4480914dfa65958b913ef89bbf4779a4eb3fc (patch) | |
| tree | 9116d80fc9b6b4f4bf08a311ae338d326bb382de /src | |
| parent | edcbcc768a484d52deb315e7c583fe4b2ab4f25b (diff) | |
| parent | 1349d86c72fe4d57134edb025d64e0ddff804d77 (diff) | |
| download | rust-bdc4480914dfa65958b913ef89bbf4779a4eb3fc.tar.gz rust-bdc4480914dfa65958b913ef89bbf4779a4eb3fc.zip | |
Rollup merge of #119231 - aDotInTheVoid:PatKind-struct-bool-docs, r=compiler-errors
Clairify `ast::PatKind::Struct` presese of `..` by using an enum instead of a bool The bool is mainly used for when a `..` is present, but it is also set on recovery to avoid errors. The doc comment not describes both of these cases. See https://github.com/rust-lang/rust/blob/cee794ee98d49b45a55ba225680d98e0c4672736/compiler/rustc_parse/src/parser/pat.rs#L890-L897 for the only place this is constructed. r? ``@compiler-errors``
Diffstat (limited to 'src')
| -rw-r--r-- | src/tools/clippy/clippy_lints/src/unnested_or_patterns.rs | 2 | ||||
| -rw-r--r-- | src/tools/rustfmt/src/patterns.rs | 12 |
2 files changed, 10 insertions, 4 deletions
diff --git a/src/tools/clippy/clippy_lints/src/unnested_or_patterns.rs b/src/tools/clippy/clippy_lints/src/unnested_or_patterns.rs index 65600009c1d..77adcdd0e6b 100644 --- a/src/tools/clippy/clippy_lints/src/unnested_or_patterns.rs +++ b/src/tools/clippy/clippy_lints/src/unnested_or_patterns.rs @@ -293,7 +293,7 @@ fn extend_with_struct_pat( qself1: &Option<P<ast::QSelf>>, path1: &ast::Path, fps1: &mut [ast::PatField], - rest1: bool, + rest1: ast::PatFieldsRest, start: usize, alternatives: &mut ThinVec<P<Pat>>, ) -> bool { diff --git a/src/tools/rustfmt/src/patterns.rs b/src/tools/rustfmt/src/patterns.rs index 8504999b8ff..0fa6edaa5d7 100644 --- a/src/tools/rustfmt/src/patterns.rs +++ b/src/tools/rustfmt/src/patterns.rs @@ -259,9 +259,15 @@ impl Rewrite for Pat { None, None, ), - PatKind::Struct(ref qself, ref path, ref fields, ellipsis) => { - rewrite_struct_pat(qself, path, fields, ellipsis, self.span, context, shape) - } + PatKind::Struct(ref qself, ref path, ref fields, rest) => rewrite_struct_pat( + qself, + path, + fields, + rest == ast::PatFieldsRest::Rest, + self.span, + context, + shape, + ), PatKind::MacCall(ref mac) => { rewrite_macro(mac, None, context, shape, MacroPosition::Pat) } |
