diff options
| author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2020-07-30 09:51:20 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-30 09:51:20 +0000 |
| commit | 74864d560b9293174c82fdee2b9d15991ebf075f (patch) | |
| tree | f76a250431629a36d225d456ed41f393aaa9a579 /xtask/src/codegen/rust.ungram | |
| parent | 72ffd851dd5b0fcdf3aa072131ba11009878b4ae (diff) | |
| parent | 7d09e5ed618b9b9d6e00b57b24db0b9c8a8c12d7 (diff) | |
| download | rust-74864d560b9293174c82fdee2b9d15991ebf075f.tar.gz rust-74864d560b9293174c82fdee2b9d15991ebf075f.zip | |
Merge #5582
5582: Finish Module grammar r=matklad a=matklad bors r+ 🤖 Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
Diffstat (limited to 'xtask/src/codegen/rust.ungram')
| -rw-r--r-- | xtask/src/codegen/rust.ungram | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/xtask/src/codegen/rust.ungram b/xtask/src/codegen/rust.ungram index a93cb381587..470ac8c8ff2 100644 --- a/xtask/src/codegen/rust.ungram +++ b/xtask/src/codegen/rust.ungram @@ -19,6 +19,13 @@ Item = | UnionDef | UseItem +Module = + Attr* Visibility? 'mod' Name + (ItemList | ';') + +ItemList = + '{' Attr* Item* '}' + FnDef = Attr* Visibility? Abi? 'const' 'default' 'async' 'unsafe' 'fn' Name TypeParamList? ParamList RetType? @@ -67,17 +74,10 @@ EnumVariant = TraitDef = Attr* Visibility? 'unsafe'? 'auto'? 'trait' Name TypeParamList (':' TypeBoundList?)? WhereClause - ItemList + AssocItemList -Module = - Attr* Visibility? 'mod' Name - (ItemList | ';') - -ItemList = - '{' - AssocItem* - Item* - '}' +AssocItemList = + '{' AssocItem* '}' ConstDef = Attr* Visibility? 'default'? 'const' Name ':' ascribed_type:TypeRef @@ -94,7 +94,7 @@ TypeAliasDef = ImplDef = Attr* Visibility? 'const'? 'default'? 'unsafe'? 'impl' TypeParamList? '!'? 'for' WhereClause? - ItemList + AssocItemList ParenType = '(' TypeRef ')' @@ -467,6 +467,7 @@ AssocItem = FnDef | TypeAliasDef | ConstDef +| MacroCall ExternItem = FnDef | StaticDef |