aboutsummaryrefslogtreecommitdiff
path: root/crates/ra_parser/src
diff options
context:
space:
mode:
authorAleksey Kladov <[email protected]>2020-02-29 20:24:40 +0000
committerAleksey Kladov <[email protected]>2020-02-29 20:33:15 +0000
commita1e18695548b5cd6661f26a985b34c8b105e1896 (patch)
treee099bb9e9c04392dcb7fed54200a989f663f3659 /crates/ra_parser/src
parentf316e074d2a2906a130d3046b5c3aa24daffb766 (diff)
Rename ast::ImplBlock -> ast::ImplDef
Diffstat (limited to 'crates/ra_parser/src')
-rw-r--r--crates/ra_parser/src/grammar.rs2
-rw-r--r--crates/ra_parser/src/grammar/items.rs4
-rw-r--r--crates/ra_parser/src/grammar/items/traits.rs6
-rw-r--r--crates/ra_parser/src/syntax_kind/generated.rs2
4 files changed, 7 insertions, 7 deletions
diff --git a/crates/ra_parser/src/grammar.rs b/crates/ra_parser/src/grammar.rs
index a46e11e1d..58098e810 100644
--- a/crates/ra_parser/src/grammar.rs
+++ b/crates/ra_parser/src/grammar.rs
@@ -152,7 +152,7 @@ pub(crate) fn reparser(
152 EXTERN_ITEM_LIST => items::extern_item_list, 152 EXTERN_ITEM_LIST => items::extern_item_list,
153 TOKEN_TREE if first_child? == T!['{'] => items::token_tree, 153 TOKEN_TREE if first_child? == T!['{'] => items::token_tree,
154 ITEM_LIST => match parent? { 154 ITEM_LIST => match parent? {
155 IMPL_BLOCK => items::impl_item_list, 155 IMPL_DEF => items::impl_item_list,
156 TRAIT_DEF => items::trait_item_list, 156 TRAIT_DEF => items::trait_item_list,
157 MODULE => items::mod_item_list, 157 MODULE => items::mod_item_list,
158 _ => return None, 158 _ => return None,
diff --git a/crates/ra_parser/src/grammar/items.rs b/crates/ra_parser/src/grammar/items.rs
index f8b43866c..433ed6812 100644
--- a/crates/ra_parser/src/grammar/items.rs
+++ b/crates/ra_parser/src/grammar/items.rs
@@ -202,8 +202,8 @@ pub(super) fn maybe_item(p: &mut Parser, m: Marker, flavor: ItemFlavor) -> Resul
202 // test unsafe_default_impl 202 // test unsafe_default_impl
203 // unsafe default impl Foo {} 203 // unsafe default impl Foo {}
204 T![impl] => { 204 T![impl] => {
205 traits::impl_block(p); 205 traits::impl_def(p);
206 m.complete(p, IMPL_BLOCK); 206 m.complete(p, IMPL_DEF);
207 } 207 }
208 208
209 // test existential_type 209 // test existential_type
diff --git a/crates/ra_parser/src/grammar/items/traits.rs b/crates/ra_parser/src/grammar/items/traits.rs
index 03dae3cdb..c819e33be 100644
--- a/crates/ra_parser/src/grammar/items/traits.rs
+++ b/crates/ra_parser/src/grammar/items/traits.rs
@@ -53,9 +53,9 @@ pub(crate) fn trait_item_list(p: &mut Parser) {
53 m.complete(p, ITEM_LIST); 53 m.complete(p, ITEM_LIST);
54} 54}
55 55
56// test impl_block 56// test impl_def
57// impl Foo {} 57// impl Foo {}
58pub(super) fn impl_block(p: &mut Parser) { 58pub(super) fn impl_def(p: &mut Parser) {
59 assert!(p.at(T![impl])); 59 assert!(p.at(T![impl]));
60 p.bump(T![impl]); 60 p.bump(T![impl]);
61 if choose_type_params_over_qpath(p) { 61 if choose_type_params_over_qpath(p) {
@@ -65,7 +65,7 @@ pub(super) fn impl_block(p: &mut Parser) {
65 // FIXME: never type 65 // FIXME: never type
66 // impl ! {} 66 // impl ! {}
67 67
68 // test impl_block_neg 68 // test impl_def_neg
69 // impl !Send for X {} 69 // impl !Send for X {}
70 p.eat(T![!]); 70 p.eat(T![!]);
71 impl_type(p); 71 impl_type(p);
diff --git a/crates/ra_parser/src/syntax_kind/generated.rs b/crates/ra_parser/src/syntax_kind/generated.rs
index 1068da0a0..dfc30d727 100644
--- a/crates/ra_parser/src/syntax_kind/generated.rs
+++ b/crates/ra_parser/src/syntax_kind/generated.rs
@@ -133,7 +133,7 @@ pub enum SyntaxKind {
133 STATIC_DEF, 133 STATIC_DEF,
134 CONST_DEF, 134 CONST_DEF,
135 TRAIT_DEF, 135 TRAIT_DEF,
136 IMPL_BLOCK, 136 IMPL_DEF,
137 TYPE_ALIAS_DEF, 137 TYPE_ALIAS_DEF,
138 MACRO_CALL, 138 MACRO_CALL,
139 TOKEN_TREE, 139 TOKEN_TREE,