From 14cb96ec0e6be3b99bfe4ea373c058dcbd2a4f79 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Fri, 31 Jul 2020 19:54:16 +0200 Subject: Allign RecordPat with RecordExpr --- xtask/src/ast_src.rs | 4 ++-- xtask/src/codegen/rust.ungram | 9 ++++----- 2 files changed, 6 insertions(+), 7 deletions(-) (limited to 'xtask/src') diff --git a/xtask/src/ast_src.rs b/xtask/src/ast_src.rs index 762d9265e..869bdaa0d 100644 --- a/xtask/src/ast_src.rs +++ b/xtask/src/ast_src.rs @@ -131,8 +131,8 @@ pub(crate) const KINDS_SRC: KindsSrc = KindsSrc { "DOT_DOT_PAT", "PATH_PAT", "RECORD_PAT", - "RECORD_FIELD_PAT_LIST", - "RECORD_FIELD_PAT", + "RECORD_PAT_FIELD_LIST", + "RECORD_PAT_FIELD", "TUPLE_STRUCT_PAT", "TUPLE_PAT", "SLICE_PAT", diff --git a/xtask/src/codegen/rust.ungram b/xtask/src/codegen/rust.ungram index 27bf563b6..643668863 100644 --- a/xtask/src/codegen/rust.ungram +++ b/xtask/src/codegen/rust.ungram @@ -529,16 +529,15 @@ RefPat = '&' 'mut'? Pat RecordPat = - Path RecordFieldPatList + Path RecordPatFieldList -RecordFieldPatList = +RecordPatFieldList = '{' - record_field_pats:RecordFieldPat* - BindPat* + fields:(RecordPatField (',' RecordPatField)* ','?) '..'? '}' -RecordFieldPat = +RecordPatField = Attr* (NameRef ':')? Pat OrPat = -- cgit v1.2.3