From c5798c4d75aa807aec47208a49101bdec3affcca Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Thu, 30 Jul 2020 18:28:28 +0200 Subject: Finalize impl Grammar --- crates/ra_syntax/src/ast/generated/nodes.rs | 31 +++++++++++----------- crates/ra_syntax/src/ast/node_ext.rs | 4 +-- crates/ra_syntax/src/validation.rs | 2 +- .../test_data/parser/err/0018_incomplete_fn.rast | 2 +- .../test_data/parser/err/0022_bad_exprs.rast | 2 +- .../test_data/parser/err/0026_imp_recovery.rast | 4 +-- .../parser/err/0037_visibility_in_traits.rast | 2 +- .../inline/err/0002_misplaced_label_err.rast | 2 +- .../parser/inline/err/0004_impl_type.rast | 12 ++++----- .../parser/inline/ok/0001_trait_item_list.rast | 2 +- .../parser/inline/ok/0006_self_param.rast | 2 +- .../parser/inline/ok/0018_arb_self_types.rast | 2 +- .../parser/inline/ok/0021_impl_item_list.rast | 2 +- .../parser/inline/ok/0047_unsafe_default_impl.rast | 2 +- .../parser/inline/ok/0063_impl_def_neg.rast | 2 +- .../test_data/parser/inline/ok/0079_impl_def.rast | 2 +- .../parser/inline/ok/0087_unsafe_impl.rast | 2 +- .../parser/inline/ok/0097_default_impl.rast | 2 +- .../inline/ok/0118_impl_inner_attributes.rast | 2 +- .../parser/inline/ok/0132_default_fn_type.rast | 2 +- .../parser/inline/ok/0150_impl_type_params.rast | 2 +- .../parser/inline/ok/0163_default_unsafe_fn.rast | 2 +- .../parser/inline/ok/0163_default_unsafe_impl.rast | 2 +- .../test_data/parser/ok/0042_ufcs_call_list.rast | 2 +- .../parser/ok/0045_block_inner_attrs.rast | 2 +- .../test_data/parser/ok/0051_parameter_attrs.rast | 2 +- .../test_data/parser/ok/0064_impl_fn_params.rast | 2 +- .../test_data/parser/ok/0066_default_const.rast | 2 +- 28 files changed, 50 insertions(+), 49 deletions(-) (limited to 'crates/ra_syntax') diff --git a/crates/ra_syntax/src/ast/generated/nodes.rs b/crates/ra_syntax/src/ast/generated/nodes.rs index 3adb6b2d4..ba00742f0 100644 --- a/crates/ra_syntax/src/ast/generated/nodes.rs +++ b/crates/ra_syntax/src/ast/generated/nodes.rs @@ -100,17 +100,18 @@ impl Fn { pub fn semicolon_token(&self) -> Option { support::token(&self.syntax, T![;]) } } #[derive(Debug, Clone, PartialEq, Eq, Hash)] -pub struct ImplDef { +pub struct Impl { pub(crate) syntax: SyntaxNode, } -impl ast::AttrsOwner for ImplDef {} -impl ast::VisibilityOwner for ImplDef {} -impl ast::GenericParamsOwner for ImplDef {} -impl ImplDef { - pub fn const_token(&self) -> Option { support::token(&self.syntax, T![const]) } +impl ast::AttrsOwner for Impl {} +impl ast::VisibilityOwner for Impl {} +impl ast::GenericParamsOwner for Impl {} +impl Impl { pub fn default_token(&self) -> Option { support::token(&self.syntax, T![default]) } pub fn unsafe_token(&self) -> Option { support::token(&self.syntax, T![unsafe]) } pub fn impl_token(&self) -> Option { support::token(&self.syntax, T![impl]) } + pub fn const_token(&self) -> Option { support::token(&self.syntax, T![const]) } + pub fn type_ref(&self) -> Option { support::child(&self.syntax) } pub fn excl_token(&self) -> Option { support::token(&self.syntax, T![!]) } pub fn for_token(&self) -> Option { support::token(&self.syntax, T![for]) } pub fn assoc_item_list(&self) -> Option { support::child(&self.syntax) } @@ -1278,7 +1279,7 @@ pub enum Item { ExternBlock(ExternBlock), ExternCrate(ExternCrate), Fn(Fn), - ImplDef(ImplDef), + Impl(Impl), MacroCall(MacroCall), Module(Module), Static(Static), @@ -1477,8 +1478,8 @@ impl AstNode for Fn { } fn syntax(&self) -> &SyntaxNode { &self.syntax } } -impl AstNode for ImplDef { - fn can_cast(kind: SyntaxKind) -> bool { kind == IMPL_DEF } +impl AstNode for Impl { + fn can_cast(kind: SyntaxKind) -> bool { kind == IMPL } fn cast(syntax: SyntaxNode) -> Option { if Self::can_cast(syntax.kind()) { Some(Self { syntax }) @@ -2790,8 +2791,8 @@ impl From for Item { impl From for Item { fn from(node: Fn) -> Item { Item::Fn(node) } } -impl From for Item { - fn from(node: ImplDef) -> Item { Item::ImplDef(node) } +impl From for Item { + fn from(node: Impl) -> Item { Item::Impl(node) } } impl From for Item { fn from(node: MacroCall) -> Item { Item::MacroCall(node) } @@ -2820,7 +2821,7 @@ impl From for Item { impl AstNode for Item { fn can_cast(kind: SyntaxKind) -> bool { match kind { - CONST | ENUM | EXTERN_BLOCK | EXTERN_CRATE | FN | IMPL_DEF | MACRO_CALL | MODULE + CONST | ENUM | EXTERN_BLOCK | EXTERN_CRATE | FN | IMPL | MACRO_CALL | MODULE | STATIC | STRUCT | TRAIT | TYPE_ALIAS | UNION | USE => true, _ => false, } @@ -2832,7 +2833,7 @@ impl AstNode for Item { EXTERN_BLOCK => Item::ExternBlock(ExternBlock { syntax }), EXTERN_CRATE => Item::ExternCrate(ExternCrate { syntax }), FN => Item::Fn(Fn { syntax }), - IMPL_DEF => Item::ImplDef(ImplDef { syntax }), + IMPL => Item::Impl(Impl { syntax }), MACRO_CALL => Item::MacroCall(MacroCall { syntax }), MODULE => Item::Module(Module { syntax }), STATIC => Item::Static(Static { syntax }), @@ -2852,7 +2853,7 @@ impl AstNode for Item { Item::ExternBlock(it) => &it.syntax, Item::ExternCrate(it) => &it.syntax, Item::Fn(it) => &it.syntax, - Item::ImplDef(it) => &it.syntax, + Item::Impl(it) => &it.syntax, Item::MacroCall(it) => &it.syntax, Item::Module(it) => &it.syntax, Item::Static(it) => &it.syntax, @@ -3491,7 +3492,7 @@ impl std::fmt::Display for Fn { std::fmt::Display::fmt(self.syntax(), f) } } -impl std::fmt::Display for ImplDef { +impl std::fmt::Display for Impl { fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { std::fmt::Display::fmt(self.syntax(), f) } diff --git a/crates/ra_syntax/src/ast/node_ext.rs b/crates/ra_syntax/src/ast/node_ext.rs index a8d8955de..313f52226 100644 --- a/crates/ra_syntax/src/ast/node_ext.rs +++ b/crates/ra_syntax/src/ast/node_ext.rs @@ -141,7 +141,7 @@ impl ast::UseTreeList { } } -impl ast::ImplDef { +impl ast::Impl { pub fn target_type(&self) -> Option { match self.target() { (Some(t), None) | (_, Some(t)) => Some(t), @@ -486,5 +486,5 @@ impl ast::DocCommentsOwner for ast::Module {} impl ast::DocCommentsOwner for ast::Static {} impl ast::DocCommentsOwner for ast::Const {} impl ast::DocCommentsOwner for ast::TypeAlias {} -impl ast::DocCommentsOwner for ast::ImplDef {} +impl ast::DocCommentsOwner for ast::Impl {} impl ast::DocCommentsOwner for ast::MacroCall {} diff --git a/crates/ra_syntax/src/validation.rs b/crates/ra_syntax/src/validation.rs index a666b18db..0325ab0b4 100644 --- a/crates/ra_syntax/src/validation.rs +++ b/crates/ra_syntax/src/validation.rs @@ -204,7 +204,7 @@ fn validate_visibility(vis: ast::Visibility, errors: &mut Vec) { _ => return, } - let impl_def = match parent.parent().and_then(|it| it.parent()).and_then(ast::ImplDef::cast) { + let impl_def = match parent.parent().and_then(|it| it.parent()).and_then(ast::Impl::cast) { Some(it) => it, None => return, }; diff --git a/crates/ra_syntax/test_data/parser/err/0018_incomplete_fn.rast b/crates/ra_syntax/test_data/parser/err/0018_incomplete_fn.rast index 1ce5f188f..bc95b8512 100644 --- a/crates/ra_syntax/test_data/parser/err/0018_incomplete_fn.rast +++ b/crates/ra_syntax/test_data/parser/err/0018_incomplete_fn.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..183 - IMPL_DEF@0..182 + IMPL@0..182 IMPL_KW@0..4 "impl" WHITESPACE@4..5 " " PATH_TYPE@5..13 diff --git a/crates/ra_syntax/test_data/parser/err/0022_bad_exprs.rast b/crates/ra_syntax/test_data/parser/err/0022_bad_exprs.rast index a6e304b78..71fb19783 100644 --- a/crates/ra_syntax/test_data/parser/err/0022_bad_exprs.rast +++ b/crates/ra_syntax/test_data/parser/err/0022_bad_exprs.rast @@ -75,7 +75,7 @@ SOURCE_FILE@0..112 ERROR@54..55 COMMA@54..55 "," WHITESPACE@55..56 " " - IMPL_DEF@56..60 + IMPL@56..60 IMPL_KW@56..60 "impl" EXPR_STMT@60..61 ERROR@60..61 diff --git a/crates/ra_syntax/test_data/parser/err/0026_imp_recovery.rast b/crates/ra_syntax/test_data/parser/err/0026_imp_recovery.rast index 8c8bf7b7e..7e4b11c27 100644 --- a/crates/ra_syntax/test_data/parser/err/0026_imp_recovery.rast +++ b/crates/ra_syntax/test_data/parser/err/0026_imp_recovery.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..38 - IMPL_DEF@0..14 + IMPL@0..14 IMPL_KW@0..4 "impl" GENERIC_PARAM_LIST@4..14 L_ANGLE@4..5 "<" @@ -17,7 +17,7 @@ SOURCE_FILE@0..38 IDENT@8..13 "Clone" R_ANGLE@13..14 ">" WHITESPACE@14..15 "\n" - IMPL_DEF@15..37 + IMPL@15..37 IMPL_KW@15..19 "impl" GENERIC_PARAM_LIST@19..22 L_ANGLE@19..20 "<" diff --git a/crates/ra_syntax/test_data/parser/err/0037_visibility_in_traits.rast b/crates/ra_syntax/test_data/parser/err/0037_visibility_in_traits.rast index b1400aa5f..faf87d6e5 100644 --- a/crates/ra_syntax/test_data/parser/err/0037_visibility_in_traits.rast +++ b/crates/ra_syntax/test_data/parser/err/0037_visibility_in_traits.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..118 - IMPL_DEF@0..117 + IMPL@0..117 IMPL_KW@0..4 "impl" WHITESPACE@4..5 " " PATH_TYPE@5..6 diff --git a/crates/ra_syntax/test_data/parser/inline/err/0002_misplaced_label_err.rast b/crates/ra_syntax/test_data/parser/inline/err/0002_misplaced_label_err.rast index 8b0a888fd..a4271fc87 100644 --- a/crates/ra_syntax/test_data/parser/inline/err/0002_misplaced_label_err.rast +++ b/crates/ra_syntax/test_data/parser/inline/err/0002_misplaced_label_err.rast @@ -17,7 +17,7 @@ SOURCE_FILE@0..30 LIFETIME@16..21 "\'loop" COLON@21..22 ":" WHITESPACE@22..23 " " - IMPL_DEF@23..27 + IMPL@23..27 IMPL_KW@23..27 "impl" WHITESPACE@27..28 "\n" R_CURLY@28..29 "}" diff --git a/crates/ra_syntax/test_data/parser/inline/err/0004_impl_type.rast b/crates/ra_syntax/test_data/parser/inline/err/0004_impl_type.rast index 2d0253aa0..29d6b3974 100644 --- a/crates/ra_syntax/test_data/parser/inline/err/0004_impl_type.rast +++ b/crates/ra_syntax/test_data/parser/inline/err/0004_impl_type.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..87 - IMPL_DEF@0..12 + IMPL@0..12 IMPL_KW@0..4 "impl" WHITESPACE@4..5 " " PATH_TYPE@5..9 @@ -12,7 +12,7 @@ SOURCE_FILE@0..87 L_CURLY@10..11 "{" R_CURLY@11..12 "}" WHITESPACE@12..13 "\n" - IMPL_DEF@13..33 + IMPL@13..33 IMPL_KW@13..17 "impl" WHITESPACE@17..18 " " PATH_TYPE@18..24 @@ -33,10 +33,10 @@ SOURCE_FILE@0..87 L_CURLY@31..32 "{" R_CURLY@32..33 "}" WHITESPACE@33..34 "\n" - IMPL_DEF@34..38 + IMPL@34..38 IMPL_KW@34..38 "impl" WHITESPACE@38..39 " " - IMPL_DEF@39..54 + IMPL@39..54 IMPL_KW@39..43 "impl" WHITESPACE@43..44 " " PATH_TYPE@44..51 @@ -49,7 +49,7 @@ SOURCE_FILE@0..87 L_CURLY@52..53 "{" R_CURLY@53..54 "}" WHITESPACE@54..55 "\n" - IMPL_DEF@55..70 + IMPL@55..70 IMPL_KW@55..59 "impl" WHITESPACE@59..60 " " PATH_TYPE@60..66 @@ -60,7 +60,7 @@ SOURCE_FILE@0..87 WHITESPACE@66..67 " " FOR_KW@67..70 "for" WHITESPACE@70..71 " " - IMPL_DEF@71..86 + IMPL@71..86 IMPL_KW@71..75 "impl" WHITESPACE@75..76 " " PATH_TYPE@76..83 diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0001_trait_item_list.rast b/crates/ra_syntax/test_data/parser/inline/ok/0001_trait_item_list.rast index 955e00dde..c7289e400 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0001_trait_item_list.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0001_trait_item_list.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..83 - IMPL_DEF@0..82 + IMPL@0..82 IMPL_KW@0..4 "impl" WHITESPACE@4..5 " " PATH_TYPE@5..6 diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0006_self_param.rast b/crates/ra_syntax/test_data/parser/inline/ok/0006_self_param.rast index 87c170707..ae61cbad8 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0006_self_param.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0006_self_param.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..128 - IMPL_DEF@0..127 + IMPL@0..127 IMPL_KW@0..4 "impl" WHITESPACE@4..5 " " PATH_TYPE@5..6 diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0018_arb_self_types.rast b/crates/ra_syntax/test_data/parser/inline/ok/0018_arb_self_types.rast index e75180900..20b2b6c19 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0018_arb_self_types.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0018_arb_self_types.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..69 - IMPL_DEF@0..68 + IMPL@0..68 IMPL_KW@0..4 "impl" WHITESPACE@4..5 " " PATH_TYPE@5..6 diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0021_impl_item_list.rast b/crates/ra_syntax/test_data/parser/inline/ok/0021_impl_item_list.rast index 52181ca0c..ca0702aba 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0021_impl_item_list.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0021_impl_item_list.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..89 - IMPL_DEF@0..88 + IMPL@0..88 IMPL_KW@0..4 "impl" WHITESPACE@4..5 " " PATH_TYPE@5..6 diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0047_unsafe_default_impl.rast b/crates/ra_syntax/test_data/parser/inline/ok/0047_unsafe_default_impl.rast index 8a6b5a8fc..d6dfa83b7 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0047_unsafe_default_impl.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0047_unsafe_default_impl.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..27 - IMPL_DEF@0..26 + IMPL@0..26 UNSAFE_KW@0..6 "unsafe" WHITESPACE@6..7 " " DEFAULT_KW@7..14 "default" diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0063_impl_def_neg.rast b/crates/ra_syntax/test_data/parser/inline/ok/0063_impl_def_neg.rast index 31178f86e..4368930cc 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0063_impl_def_neg.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0063_impl_def_neg.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..20 - IMPL_DEF@0..19 + IMPL@0..19 IMPL_KW@0..4 "impl" WHITESPACE@4..5 " " BANG@5..6 "!" diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0079_impl_def.rast b/crates/ra_syntax/test_data/parser/inline/ok/0079_impl_def.rast index 26825ef86..209711fc4 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0079_impl_def.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0079_impl_def.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..12 - IMPL_DEF@0..11 + IMPL@0..11 IMPL_KW@0..4 "impl" WHITESPACE@4..5 " " PATH_TYPE@5..8 diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0087_unsafe_impl.rast b/crates/ra_syntax/test_data/parser/inline/ok/0087_unsafe_impl.rast index e3223cee5..43c09affe 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0087_unsafe_impl.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0087_unsafe_impl.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..19 - IMPL_DEF@0..18 + IMPL@0..18 UNSAFE_KW@0..6 "unsafe" WHITESPACE@6..7 " " IMPL_KW@7..11 "impl" diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0097_default_impl.rast b/crates/ra_syntax/test_data/parser/inline/ok/0097_default_impl.rast index 8a839a4a6..0a1b21d6e 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0097_default_impl.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0097_default_impl.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..20 - IMPL_DEF@0..19 + IMPL@0..19 DEFAULT_KW@0..7 "default" WHITESPACE@7..8 " " IMPL_KW@8..12 "impl" diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0118_impl_inner_attributes.rast b/crates/ra_syntax/test_data/parser/inline/ok/0118_impl_inner_attributes.rast index f2561abd6..141a7b203 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0118_impl_inner_attributes.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0118_impl_inner_attributes.rast @@ -8,7 +8,7 @@ SOURCE_FILE@0..94 L_CURLY@6..7 "{" R_CURLY@7..8 "}" WHITESPACE@8..9 "\n" - IMPL_DEF@9..93 + IMPL@9..93 IMPL_KW@9..13 "impl" WHITESPACE@13..14 " " PATH_TYPE@14..15 diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0132_default_fn_type.rast b/crates/ra_syntax/test_data/parser/inline/ok/0132_default_fn_type.rast index de02238df..b8d26a53a 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0132_default_fn_type.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0132_default_fn_type.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..69 - IMPL_DEF@0..68 + IMPL@0..68 IMPL_KW@0..4 "impl" WHITESPACE@4..5 " " PATH_TYPE@5..6 diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0150_impl_type_params.rast b/crates/ra_syntax/test_data/parser/inline/ok/0150_impl_type_params.rast index 07e555d63..8f197a19d 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0150_impl_type_params.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0150_impl_type_params.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..29 - IMPL_DEF@0..28 + IMPL@0..28 IMPL_KW@0..4 "impl" GENERIC_PARAM_LIST@4..18 L_ANGLE@4..5 "<" diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0163_default_unsafe_fn.rast b/crates/ra_syntax/test_data/parser/inline/ok/0163_default_unsafe_fn.rast index 680f35445..1269621dc 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0163_default_unsafe_fn.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0163_default_unsafe_fn.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..50 - IMPL_DEF@0..49 + IMPL@0..49 IMPL_KW@0..4 "impl" WHITESPACE@4..5 " " PATH_TYPE@5..6 diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0163_default_unsafe_impl.rast b/crates/ra_syntax/test_data/parser/inline/ok/0163_default_unsafe_impl.rast index e0c338297..6bfe925af 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0163_default_unsafe_impl.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0163_default_unsafe_impl.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..27 - IMPL_DEF@0..26 + IMPL@0..26 DEFAULT_KW@0..7 "default" WHITESPACE@7..8 " " UNSAFE_KW@8..14 "unsafe" diff --git a/crates/ra_syntax/test_data/parser/ok/0042_ufcs_call_list.rast b/crates/ra_syntax/test_data/parser/ok/0042_ufcs_call_list.rast index c4ffc0a3d..ed29b0812 100644 --- a/crates/ra_syntax/test_data/parser/ok/0042_ufcs_call_list.rast +++ b/crates/ra_syntax/test_data/parser/ok/0042_ufcs_call_list.rast @@ -8,7 +8,7 @@ SOURCE_FILE@0..199 IDENT@69..72 "Foo" SEMICOLON@72..73 ";" WHITESPACE@73..75 "\n\n" - IMPL_DEF@75..141 + IMPL@75..141 IMPL_KW@75..79 "impl" WHITESPACE@79..80 " " PATH_TYPE@80..83 diff --git a/crates/ra_syntax/test_data/parser/ok/0045_block_inner_attrs.rast b/crates/ra_syntax/test_data/parser/ok/0045_block_inner_attrs.rast index 5ebc53618..139ce9046 100644 --- a/crates/ra_syntax/test_data/parser/ok/0045_block_inner_attrs.rast +++ b/crates/ra_syntax/test_data/parser/ok/0045_block_inner_attrs.rast @@ -89,7 +89,7 @@ SOURCE_FILE@0..686 WHITESPACE@461..463 "\n\n" COMMENT@463..523 "// https://github.com ..." WHITESPACE@523..524 "\n" - IMPL_DEF@524..685 + IMPL@524..685 IMPL_KW@524..528 "impl" WHITESPACE@528..529 " " PATH_TYPE@529..537 diff --git a/crates/ra_syntax/test_data/parser/ok/0051_parameter_attrs.rast b/crates/ra_syntax/test_data/parser/ok/0051_parameter_attrs.rast index 7a574ebb4..2cc849784 100644 --- a/crates/ra_syntax/test_data/parser/ok/0051_parameter_attrs.rast +++ b/crates/ra_syntax/test_data/parser/ok/0051_parameter_attrs.rast @@ -251,7 +251,7 @@ SOURCE_FILE@0..519 WHITESPACE@234..235 "\n" R_CURLY@235..236 "}" WHITESPACE@236..238 "\n\n" - IMPL_DEF@238..519 + IMPL@238..519 IMPL_KW@238..242 "impl" WHITESPACE@242..243 " " PATH_TYPE@243..244 diff --git a/crates/ra_syntax/test_data/parser/ok/0064_impl_fn_params.rast b/crates/ra_syntax/test_data/parser/ok/0064_impl_fn_params.rast index ef0eca47c..453757c3c 100644 --- a/crates/ra_syntax/test_data/parser/ok/0064_impl_fn_params.rast +++ b/crates/ra_syntax/test_data/parser/ok/0064_impl_fn_params.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..137 - IMPL_DEF@0..136 + IMPL@0..136 IMPL_KW@0..4 "impl" WHITESPACE@4..5 " " PATH_TYPE@5..6 diff --git a/crates/ra_syntax/test_data/parser/ok/0066_default_const.rast b/crates/ra_syntax/test_data/parser/ok/0066_default_const.rast index 485efe20c..6246a31a6 100644 --- a/crates/ra_syntax/test_data/parser/ok/0066_default_const.rast +++ b/crates/ra_syntax/test_data/parser/ok/0066_default_const.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..46 - IMPL_DEF@0..45 + IMPL@0..45 IMPL_KW@0..4 "impl" WHITESPACE@4..5 " " PATH_TYPE@5..6 -- cgit v1.2.3