aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--crates/libeditor/src/lib.rs2
-rw-r--r--crates/libsyntax2/src/grammar.ron2
-rw-r--r--crates/libsyntax2/src/grammar/items/mod.rs2
-rw-r--r--crates/libsyntax2/src/syntax_kinds/generated.rs4
-rw-r--r--crates/libsyntax2/tests/data/parser/ok/0019_enums.txt10
5 files changed, 10 insertions, 10 deletions
diff --git a/crates/libeditor/src/lib.rs b/crates/libeditor/src/lib.rs
index a83fb7d17..df0938e90 100644
--- a/crates/libeditor/src/lib.rs
+++ b/crates/libeditor/src/lib.rs
@@ -141,7 +141,7 @@ struct Declaration<'f> (SyntaxNodeRef<'f>);
141impl<'f> Declaration<'f> { 141impl<'f> Declaration<'f> {
142 fn cast(node: SyntaxNodeRef<'f>) -> Option<Declaration<'f>> { 142 fn cast(node: SyntaxNodeRef<'f>) -> Option<Declaration<'f>> {
143 match node.kind() { 143 match node.kind() {
144 | STRUCT | ENUM_ITEM | FUNCTION | TRAIT_ITEM 144 | STRUCT | ENUM | FUNCTION | TRAIT_ITEM
145 | CONST_ITEM | STATIC_ITEM | MOD_ITEM | NAMED_FIELD 145 | CONST_ITEM | STATIC_ITEM | MOD_ITEM | NAMED_FIELD
146 | TYPE_ITEM => Some(Declaration(node)), 146 | TYPE_ITEM => Some(Declaration(node)),
147 _ => None 147 _ => None
diff --git a/crates/libsyntax2/src/grammar.ron b/crates/libsyntax2/src/grammar.ron
index 4d0343747..06a4eb6a7 100644
--- a/crates/libsyntax2/src/grammar.ron
+++ b/crates/libsyntax2/src/grammar.ron
@@ -109,7 +109,7 @@ Grammar(
109 "FILE", 109 "FILE",
110 110
111 "STRUCT", 111 "STRUCT",
112 "ENUM_ITEM", 112 "ENUM",
113 "FUNCTION", 113 "FUNCTION",
114 "EXTERN_CRATE_ITEM", 114 "EXTERN_CRATE_ITEM",
115 "MOD_ITEM", 115 "MOD_ITEM",
diff --git a/crates/libsyntax2/src/grammar/items/mod.rs b/crates/libsyntax2/src/grammar/items/mod.rs
index 1125daed9..be4ff976a 100644
--- a/crates/libsyntax2/src/grammar/items/mod.rs
+++ b/crates/libsyntax2/src/grammar/items/mod.rs
@@ -175,7 +175,7 @@ fn items_without_modifiers(p: &mut Parser) -> Option<SyntaxKind> {
175 } 175 }
176 ENUM_KW => { 176 ENUM_KW => {
177 structs::enum_item(p); 177 structs::enum_item(p);
178 ENUM_ITEM 178 ENUM
179 } 179 }
180 USE_KW => { 180 USE_KW => {
181 use_item::use_item(p); 181 use_item::use_item(p);
diff --git a/crates/libsyntax2/src/syntax_kinds/generated.rs b/crates/libsyntax2/src/syntax_kinds/generated.rs
index 7e7d00d9d..7d2fb60f6 100644
--- a/crates/libsyntax2/src/syntax_kinds/generated.rs
+++ b/crates/libsyntax2/src/syntax_kinds/generated.rs
@@ -109,7 +109,7 @@ pub enum SyntaxKind {
109 SHEBANG, 109 SHEBANG,
110 FILE, 110 FILE,
111 STRUCT, 111 STRUCT,
112 ENUM_ITEM, 112 ENUM,
113 FUNCTION, 113 FUNCTION,
114 EXTERN_CRATE_ITEM, 114 EXTERN_CRATE_ITEM,
115 MOD_ITEM, 115 MOD_ITEM,
@@ -344,7 +344,7 @@ impl SyntaxKind {
344 SHEBANG => &SyntaxInfo { name: "SHEBANG" }, 344 SHEBANG => &SyntaxInfo { name: "SHEBANG" },
345 FILE => &SyntaxInfo { name: "FILE" }, 345 FILE => &SyntaxInfo { name: "FILE" },
346 STRUCT => &SyntaxInfo { name: "STRUCT" }, 346 STRUCT => &SyntaxInfo { name: "STRUCT" },
347 ENUM_ITEM => &SyntaxInfo { name: "ENUM_ITEM" }, 347 ENUM => &SyntaxInfo { name: "ENUM" },
348 FUNCTION => &SyntaxInfo { name: "FUNCTION" }, 348 FUNCTION => &SyntaxInfo { name: "FUNCTION" },
349 EXTERN_CRATE_ITEM => &SyntaxInfo { name: "EXTERN_CRATE_ITEM" }, 349 EXTERN_CRATE_ITEM => &SyntaxInfo { name: "EXTERN_CRATE_ITEM" },
350 MOD_ITEM => &SyntaxInfo { name: "MOD_ITEM" }, 350 MOD_ITEM => &SyntaxInfo { name: "MOD_ITEM" },
diff --git a/crates/libsyntax2/tests/data/parser/ok/0019_enums.txt b/crates/libsyntax2/tests/data/parser/ok/0019_enums.txt
index 8650381cd..0ddf7eb9d 100644
--- a/crates/libsyntax2/tests/data/parser/ok/0019_enums.txt
+++ b/crates/libsyntax2/tests/data/parser/ok/0019_enums.txt
@@ -1,5 +1,5 @@
1FILE@[0; 182) 1FILE@[0; 182)
2 ENUM_ITEM@[0; 11) 2 ENUM@[0; 11)
3 ENUM_KW@[0; 4) 3 ENUM_KW@[0; 4)
4 WHITESPACE@[4; 5) 4 WHITESPACE@[4; 5)
5 NAME@[5; 7) 5 NAME@[5; 7)
@@ -9,7 +9,7 @@ FILE@[0; 182)
9 WHITESPACE@[9; 10) 9 WHITESPACE@[9; 10)
10 R_CURLY@[10; 11) 10 R_CURLY@[10; 11)
11 WHITESPACE@[11; 13) 11 WHITESPACE@[11; 13)
12 ENUM_ITEM@[13; 27) 12 ENUM@[13; 27)
13 ENUM_KW@[13; 17) 13 ENUM_KW@[13; 17)
14 WHITESPACE@[17; 18) 14 WHITESPACE@[17; 18)
15 NAME@[18; 20) 15 NAME@[18; 20)
@@ -25,7 +25,7 @@ FILE@[0; 182)
25 WHITESPACE@[25; 26) 25 WHITESPACE@[25; 26)
26 R_CURLY@[26; 27) 26 R_CURLY@[26; 27)
27 WHITESPACE@[27; 29) 27 WHITESPACE@[27; 29)
28 ENUM_ITEM@[29; 46) 28 ENUM@[29; 46)
29 ENUM_KW@[29; 33) 29 ENUM_KW@[29; 33)
30 WHITESPACE@[33; 34) 30 WHITESPACE@[33; 34)
31 NAME@[34; 36) 31 NAME@[34; 36)
@@ -39,7 +39,7 @@ FILE@[0; 182)
39 WHITESPACE@[44; 45) 39 WHITESPACE@[44; 45)
40 R_CURLY@[45; 46) 40 R_CURLY@[45; 46)
41 WHITESPACE@[46; 48) 41 WHITESPACE@[46; 48)
42 ENUM_ITEM@[48; 66) 42 ENUM@[48; 66)
43 ENUM_KW@[48; 52) 43 ENUM_KW@[48; 52)
44 WHITESPACE@[52; 53) 44 WHITESPACE@[52; 53)
45 NAME@[53; 55) 45 NAME@[53; 55)
@@ -54,7 +54,7 @@ FILE@[0; 182)
54 WHITESPACE@[64; 65) 54 WHITESPACE@[64; 65)
55 R_CURLY@[65; 66) 55 R_CURLY@[65; 66)
56 WHITESPACE@[66; 68) 56 WHITESPACE@[66; 68)
57 ENUM_ITEM@[68; 181) 57 ENUM@[68; 181)
58 ENUM_KW@[68; 72) 58 ENUM_KW@[68; 72)
59 WHITESPACE@[72; 73) 59 WHITESPACE@[72; 73)
60 NAME@[73; 75) 60 NAME@[73; 75)