diff options
| author | bors[bot] <bors[bot]@users.noreply.github.com> | 2018-02-10 09:54:34 +0000 |
|---|---|---|
| committer | bors[bot] <bors[bot]@users.noreply.github.com> | 2018-02-10 09:54:34 +0000 |
| commit | c3b009b6d24225ad2add62fce8206918fceba3eb (patch) | |
| tree | 6e68e8242bbc181e5a846754466d4109783b6a2f /grammar.ron | |
| parent | 419b9b7e5efd895249934551cb2588b27a956f58 (diff) | |
| parent | dd6e5371ebddeaeecb3d1e2d3d6c8b3c9050bb05 (diff) | |
Merge #45
45: Types r=matklad a=matklad
bors r+
Diffstat (limited to 'grammar.ron')
| -rw-r--r-- | grammar.ron | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/grammar.ron b/grammar.ron index e97ef0c2c..c38bf654d 100644 --- a/grammar.ron +++ b/grammar.ron | |||
| @@ -26,6 +26,7 @@ Grammar( | |||
| 26 | "static", | 26 | "static", |
| 27 | "mut", | 27 | "mut", |
| 28 | "unsafe", | 28 | "unsafe", |
| 29 | "type", | ||
| 29 | ], | 30 | ], |
| 30 | contextual_keywords: [ | 31 | contextual_keywords: [ |
| 31 | "auto", | 32 | "auto", |
| @@ -98,6 +99,7 @@ Grammar( | |||
| 98 | "CONST_ITEM", | 99 | "CONST_ITEM", |
| 99 | "TRAIT_ITEM", | 100 | "TRAIT_ITEM", |
| 100 | "IMPL_ITEM", | 101 | "IMPL_ITEM", |
| 102 | "TYPE_ITEM", | ||
| 101 | 103 | ||
| 102 | "EXTERN_BLOCK", | 104 | "EXTERN_BLOCK", |
| 103 | "ENUM_VARIANT", | 105 | "ENUM_VARIANT", |
| @@ -112,6 +114,7 @@ Grammar( | |||
| 112 | "ALIAS", | 114 | "ALIAS", |
| 113 | "VISIBILITY", | 115 | "VISIBILITY", |
| 114 | "TYPE_PARAM_LIST", | 116 | "TYPE_PARAM_LIST", |
| 117 | "WHERE_CLAUSE", | ||
| 115 | "LIFETIME_PARAM", | 118 | "LIFETIME_PARAM", |
| 116 | "TYPE_PARAM", | 119 | "TYPE_PARAM", |
| 117 | "ABI", | 120 | "ABI", |