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 /compiler/rustc_ast/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 'compiler/rustc_ast/src')
| -rw-r--r-- | compiler/rustc_ast/src/ast.rs | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/compiler/rustc_ast/src/ast.rs b/compiler/rustc_ast/src/ast.rs index 929757fced8..3496cfc38c8 100644 --- a/compiler/rustc_ast/src/ast.rs +++ b/compiler/rustc_ast/src/ast.rs @@ -754,8 +754,7 @@ pub enum PatKind { Ident(BindingAnnotation, Ident, Option<P<Pat>>), /// A struct or struct variant pattern (e.g., `Variant {x, y, ..}`). - /// The `bool` is `true` in the presence of a `..`. - Struct(Option<P<QSelf>>, Path, ThinVec<PatField>, /* recovered */ bool), + Struct(Option<P<QSelf>>, Path, ThinVec<PatField>, PatFieldsRest), /// A tuple struct/variant pattern (`Variant(x, y, .., z)`). TupleStruct(Option<P<QSelf>>, Path, ThinVec<P<Pat>>), @@ -812,6 +811,15 @@ pub enum PatKind { MacCall(P<MacCall>), } +/// Whether the `..` is present in a struct fields pattern. +#[derive(Clone, Copy, Encodable, Decodable, Debug, PartialEq)] +pub enum PatFieldsRest { + /// `module::StructName { field, ..}` + Rest, + /// `module::StructName { field }` + None, +} + /// The kind of borrow in an `AddrOf` expression, /// e.g., `&place` or `&raw const place`. #[derive(Clone, Copy, PartialEq, Eq, Debug)] |
