diff options
author | bors[bot] <bors[bot]@users.noreply.github.com> | 2018-02-02 20:46:04 +0000 |
---|---|---|
committer | bors[bot] <bors[bot]@users.noreply.github.com> | 2018-02-02 20:46:04 +0000 |
commit | 5e7504b978c9b1365e0381691ef453e97603defa (patch) | |
tree | 44333026e9a488deef5ebc73eb6c8a277d1975dc /src/syntax_kinds.rs | |
parent | f9ecc680f0317bc56e661d7b41e7edcf52b2f995 (diff) | |
parent | 0000f4f4f2f32c6ff67db6cbc27e3a49c85f4b99 (diff) |
Merge #36
36: Static items r=matklad a=matklad
Diffstat (limited to 'src/syntax_kinds.rs')
-rw-r--r-- | src/syntax_kinds.rs | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/src/syntax_kinds.rs b/src/syntax_kinds.rs index 7577fa037..8d21d3fb7 100644 --- a/src/syntax_kinds.rs +++ b/src/syntax_kinds.rs | |||
@@ -28,6 +28,9 @@ pub enum SyntaxKind { | |||
28 | WHILE_KW, | 28 | WHILE_KW, |
29 | IF_KW, | 29 | IF_KW, |
30 | MATCH_KW, | 30 | MATCH_KW, |
31 | CONST_KW, | ||
32 | STATIC_KW, | ||
33 | MUT_KW, | ||
31 | ERROR, | 34 | ERROR, |
32 | IDENT, | 35 | IDENT, |
33 | UNDERSCORE, | 36 | UNDERSCORE, |
@@ -86,6 +89,7 @@ pub enum SyntaxKind { | |||
86 | EXTERN_CRATE_ITEM, | 89 | EXTERN_CRATE_ITEM, |
87 | MOD_ITEM, | 90 | MOD_ITEM, |
88 | USE_ITEM, | 91 | USE_ITEM, |
92 | STATIC_ITEM, | ||
89 | EXTERN_BLOCK, | 93 | EXTERN_BLOCK, |
90 | ENUM_VARIANT, | 94 | ENUM_VARIANT, |
91 | NAMED_FIELD, | 95 | NAMED_FIELD, |
@@ -137,6 +141,9 @@ impl SyntaxKind { | |||
137 | WHILE_KW => &SyntaxInfo { name: "WHILE_KW" }, | 141 | WHILE_KW => &SyntaxInfo { name: "WHILE_KW" }, |
138 | IF_KW => &SyntaxInfo { name: "IF_KW" }, | 142 | IF_KW => &SyntaxInfo { name: "IF_KW" }, |
139 | MATCH_KW => &SyntaxInfo { name: "MATCH_KW" }, | 143 | MATCH_KW => &SyntaxInfo { name: "MATCH_KW" }, |
144 | CONST_KW => &SyntaxInfo { name: "CONST_KW" }, | ||
145 | STATIC_KW => &SyntaxInfo { name: "STATIC_KW" }, | ||
146 | MUT_KW => &SyntaxInfo { name: "MUT_KW" }, | ||
140 | ERROR => &SyntaxInfo { name: "ERROR" }, | 147 | ERROR => &SyntaxInfo { name: "ERROR" }, |
141 | IDENT => &SyntaxInfo { name: "IDENT" }, | 148 | IDENT => &SyntaxInfo { name: "IDENT" }, |
142 | UNDERSCORE => &SyntaxInfo { name: "UNDERSCORE" }, | 149 | UNDERSCORE => &SyntaxInfo { name: "UNDERSCORE" }, |
@@ -195,6 +202,7 @@ impl SyntaxKind { | |||
195 | EXTERN_CRATE_ITEM => &SyntaxInfo { name: "EXTERN_CRATE_ITEM" }, | 202 | EXTERN_CRATE_ITEM => &SyntaxInfo { name: "EXTERN_CRATE_ITEM" }, |
196 | MOD_ITEM => &SyntaxInfo { name: "MOD_ITEM" }, | 203 | MOD_ITEM => &SyntaxInfo { name: "MOD_ITEM" }, |
197 | USE_ITEM => &SyntaxInfo { name: "USE_ITEM" }, | 204 | USE_ITEM => &SyntaxInfo { name: "USE_ITEM" }, |
205 | STATIC_ITEM => &SyntaxInfo { name: "STATIC_ITEM" }, | ||
198 | EXTERN_BLOCK => &SyntaxInfo { name: "EXTERN_BLOCK" }, | 206 | EXTERN_BLOCK => &SyntaxInfo { name: "EXTERN_BLOCK" }, |
199 | ENUM_VARIANT => &SyntaxInfo { name: "ENUM_VARIANT" }, | 207 | ENUM_VARIANT => &SyntaxInfo { name: "ENUM_VARIANT" }, |
200 | NAMED_FIELD => &SyntaxInfo { name: "NAMED_FIELD" }, | 208 | NAMED_FIELD => &SyntaxInfo { name: "NAMED_FIELD" }, |
@@ -242,6 +250,9 @@ pub(crate) fn ident_to_keyword(ident: &str) -> Option<SyntaxKind> { | |||
242 | "while" => Some(WHILE_KW), | 250 | "while" => Some(WHILE_KW), |
243 | "if" => Some(IF_KW), | 251 | "if" => Some(IF_KW), |
244 | "match" => Some(MATCH_KW), | 252 | "match" => Some(MATCH_KW), |
253 | "const" => Some(CONST_KW), | ||
254 | "static" => Some(STATIC_KW), | ||
255 | "mut" => Some(MUT_KW), | ||
245 | _ => None, | 256 | _ => None, |
246 | } | 257 | } |
247 | } | 258 | } |