diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2020-07-30 17:07:32 +0100 |
---|---|---|
committer | GitHub <[email protected]> | 2020-07-30 17:07:32 +0100 |
commit | 8de0eb904baf1fa261a7825402bb3adf0c23b843 (patch) | |
tree | 34296539101d8db4a484c472a45a1e30503791ef /xtask/src/codegen/rust.ungram | |
parent | 97df465391f50521c5102474d7e0ee2ea61ef48e (diff) | |
parent | 609680ef97dbf82c07b6b06e21aa366423892304 (diff) |
Merge #5603
5603: Rename EnumDef -> Enum r=matklad a=matklad
bors r+
🤖
Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'xtask/src/codegen/rust.ungram')
-rw-r--r-- | xtask/src/codegen/rust.ungram | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/xtask/src/codegen/rust.ungram b/xtask/src/codegen/rust.ungram index d038c5c5a..9c6797cb7 100644 --- a/xtask/src/codegen/rust.ungram +++ b/xtask/src/codegen/rust.ungram | |||
@@ -5,7 +5,7 @@ SourceFile = | |||
5 | 5 | ||
6 | Item = | 6 | Item = |
7 | ConstDef | 7 | ConstDef |
8 | | EnumDef | 8 | | Enum |
9 | | ExternBlock | 9 | | ExternBlock |
10 | | ExternCrate | 10 | | ExternCrate |
11 | | Fn | 11 | | Fn |
@@ -98,11 +98,7 @@ FieldList = | |||
98 | RecordFieldList | 98 | RecordFieldList |
99 | | TupleFieldList | 99 | | TupleFieldList |
100 | 100 | ||
101 | Union = | 101 | Enum = |
102 | Attr* Visibility? 'union' Name GenericParamList? WhereClause? | ||
103 | RecordFieldList | ||
104 | |||
105 | EnumDef = | ||
106 | Attr* Visibility? 'enum' Name GenericParamList? WhereClause? | 102 | Attr* Visibility? 'enum' Name GenericParamList? WhereClause? |
107 | variant_list:EnumVariantList | 103 | variant_list:EnumVariantList |
108 | 104 | ||
@@ -112,6 +108,10 @@ EnumVariantList = | |||
112 | EnumVariant = | 108 | EnumVariant = |
113 | Attr* Visibility? Name FieldList ('=' Expr)? | 109 | Attr* Visibility? Name FieldList ('=' Expr)? |
114 | 110 | ||
111 | Union = | ||
112 | Attr* Visibility? 'union' Name GenericParamList? WhereClause? | ||
113 | RecordFieldList | ||
114 | |||
115 | TraitDef = | 115 | TraitDef = |
116 | Attr* Visibility? 'unsafe'? 'auto'? 'trait' Name GenericParamList | 116 | Attr* Visibility? 'unsafe'? 'auto'? 'trait' Name GenericParamList |
117 | (':' TypeBoundList?)? WhereClause | 117 | (':' TypeBoundList?)? WhereClause |
@@ -454,7 +454,7 @@ MetaItem = | |||
454 | 454 | ||
455 | AdtDef = | 455 | AdtDef = |
456 | Struct | 456 | Struct |
457 | | EnumDef | 457 | | Enum |
458 | | Union | 458 | | Union |
459 | 459 | ||
460 | TypeRef = | 460 | TypeRef = |