diff options
author | bors[bot] <bors[bot]@users.noreply.github.com> | 2018-02-04 11:04:02 +0000 |
---|---|---|
committer | bors[bot] <bors[bot]@users.noreply.github.com> | 2018-02-04 11:04:02 +0000 |
commit | aa36ad008eae28d1251a4bf276b1d13398fcf89f (patch) | |
tree | 838d2875f00d1d0c4b3d747dfd7c314abf9ac404 /src/syntax_kinds.rs | |
parent | 5e5313a7c71d8aa873b418575f56d23b2eac6e7f (diff) | |
parent | d4179550cd69a23a79ed27a96b93f9f760c02b69 (diff) |
Merge #41
41: G: unsafe impl & trait r=matklad a=matklad
bors r+
Diffstat (limited to 'src/syntax_kinds.rs')
-rw-r--r-- | src/syntax_kinds.rs | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/syntax_kinds.rs b/src/syntax_kinds.rs index c182aea78..22c615831 100644 --- a/src/syntax_kinds.rs +++ b/src/syntax_kinds.rs | |||
@@ -92,6 +92,8 @@ pub enum SyntaxKind { | |||
92 | USE_ITEM, | 92 | USE_ITEM, |
93 | STATIC_ITEM, | 93 | STATIC_ITEM, |
94 | CONST_ITEM, | 94 | CONST_ITEM, |
95 | TRAIT_ITEM, | ||
96 | IMPL_ITEM, | ||
95 | EXTERN_BLOCK, | 97 | EXTERN_BLOCK, |
96 | ENUM_VARIANT, | 98 | ENUM_VARIANT, |
97 | NAMED_FIELD, | 99 | NAMED_FIELD, |
@@ -207,6 +209,8 @@ impl SyntaxKind { | |||
207 | USE_ITEM => &SyntaxInfo { name: "USE_ITEM" }, | 209 | USE_ITEM => &SyntaxInfo { name: "USE_ITEM" }, |
208 | STATIC_ITEM => &SyntaxInfo { name: "STATIC_ITEM" }, | 210 | STATIC_ITEM => &SyntaxInfo { name: "STATIC_ITEM" }, |
209 | CONST_ITEM => &SyntaxInfo { name: "CONST_ITEM" }, | 211 | CONST_ITEM => &SyntaxInfo { name: "CONST_ITEM" }, |
212 | TRAIT_ITEM => &SyntaxInfo { name: "TRAIT_ITEM" }, | ||
213 | IMPL_ITEM => &SyntaxInfo { name: "IMPL_ITEM" }, | ||
210 | EXTERN_BLOCK => &SyntaxInfo { name: "EXTERN_BLOCK" }, | 214 | EXTERN_BLOCK => &SyntaxInfo { name: "EXTERN_BLOCK" }, |
211 | ENUM_VARIANT => &SyntaxInfo { name: "ENUM_VARIANT" }, | 215 | ENUM_VARIANT => &SyntaxInfo { name: "ENUM_VARIANT" }, |
212 | NAMED_FIELD => &SyntaxInfo { name: "NAMED_FIELD" }, | 216 | NAMED_FIELD => &SyntaxInfo { name: "NAMED_FIELD" }, |