From 216a5344c8ef3c3e430d2761dc8b1a7b60250a15 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Thu, 30 Jul 2020 17:50:40 +0200 Subject: Rename StructDef -> Struct --- crates/ra_syntax/src/ast.rs | 2 +- crates/ra_syntax/src/ast/generated/nodes.rs | 42 +++++++++++----------- crates/ra_syntax/src/ast/node_ext.rs | 4 +-- crates/ra_syntax/src/parsing/text_tree_sink.rs | 4 +-- .../err/0000_struct_field_missing_comma.rast | 2 +- .../parser/err/0001_item_recovery_in_file.rast | 2 +- .../test_data/parser/err/0003_C++_semicolon.rast | 2 +- .../parser/err/0006_named_field_recovery.rast | 2 +- .../parser/err/0007_stray_curly_in_file.rast | 2 +- .../err/0009_broken_struct_type_parameter.rast | 4 +-- .../test_data/parser/err/0011_extern_struct.rast | 2 +- .../test_data/parser/err/0013_invalid_type.rast | 2 +- .../test_data/parser/err/0022_bad_exprs.rast | 2 +- .../parser/inline/ok/0007_type_param_bounds.rast | 2 +- .../parser/inline/ok/0022_crate_visibility.rast | 8 ++--- .../parser/inline/ok/0040_crate_keyword_vis.rast | 4 +-- .../parser/inline/ok/0054_record_field_attrs.rast | 2 +- .../parser/inline/ok/0062_mod_contents.rast | 2 +- .../parser/inline/ok/0083_struct_items.rast | 10 +++--- .../parser/inline/ok/0090_type_param_default.rast | 2 +- .../parser/inline/ok/0114_tuple_struct_where.rast | 4 +-- .../parser/inline/ok/0115_tuple_field_attrs.rast | 2 +- .../inline/ok/0134_nocontentexpr_after_item.rast | 2 +- .../parser/inline/ok/0147_const_param.rast | 2 +- .../test_data/parser/ok/0001_struct_item.rast | 2 +- .../parser/ok/0002_struct_item_field.rast | 2 +- .../test_data/parser/ok/0008_mod_item.rast | 2 +- .../test_data/parser/ok/0016_struct_flavors.rast | 10 +++--- .../parser/ok/0018_struct_type_params.rast | 30 ++++++++-------- .../parser/ok/0020_type_param_bounds.rast | 20 +++++------ .../parser/ok/0040_raw_struct_item_field.rast | 2 +- .../test_data/parser/ok/0042_ufcs_call_list.rast | 2 +- .../parser/ok/0043_complex_assignment.rast | 2 +- 33 files changed, 92 insertions(+), 92 deletions(-) (limited to 'crates/ra_syntax') diff --git a/crates/ra_syntax/src/ast.rs b/crates/ra_syntax/src/ast.rs index 452e67c70..b69b6e85e 100644 --- a/crates/ra_syntax/src/ast.rs +++ b/crates/ra_syntax/src/ast.rs @@ -235,7 +235,7 @@ fn test_comments_preserve_trailing_whitespace() { ) .ok() .unwrap(); - let def = file.syntax().descendants().find_map(StructDef::cast).unwrap(); + let def = file.syntax().descendants().find_map(Struct::cast).unwrap(); assert_eq!( "Representation of a Realm. \nIn the specification these are called Realm Records.", def.doc_comment_text().unwrap() diff --git a/crates/ra_syntax/src/ast/generated/nodes.rs b/crates/ra_syntax/src/ast/generated/nodes.rs index d153e8528..0fd3d4f1b 100644 --- a/crates/ra_syntax/src/ast/generated/nodes.rs +++ b/crates/ra_syntax/src/ast/generated/nodes.rs @@ -155,14 +155,14 @@ impl StaticDef { pub fn semicolon_token(&self) -> Option { support::token(&self.syntax, T![;]) } } #[derive(Debug, Clone, PartialEq, Eq, Hash)] -pub struct StructDef { +pub struct Struct { pub(crate) syntax: SyntaxNode, } -impl ast::AttrsOwner for StructDef {} -impl ast::NameOwner for StructDef {} -impl ast::VisibilityOwner for StructDef {} -impl ast::GenericParamsOwner for StructDef {} -impl StructDef { +impl ast::AttrsOwner for Struct {} +impl ast::NameOwner for Struct {} +impl ast::VisibilityOwner for Struct {} +impl ast::GenericParamsOwner for Struct {} +impl Struct { pub fn struct_token(&self) -> Option { support::token(&self.syntax, T![struct]) } pub fn semicolon_token(&self) -> Option { support::token(&self.syntax, T![;]) } pub fn field_list(&self) -> Option { support::child(&self.syntax) } @@ -1281,7 +1281,7 @@ pub enum Item { MacroCall(MacroCall), Module(Module), StaticDef(StaticDef), - StructDef(StructDef), + Struct(Struct), TraitDef(TraitDef), TypeAlias(TypeAlias), Union(Union), @@ -1391,7 +1391,7 @@ impl ast::NameOwner for ExternItem {} impl ast::VisibilityOwner for ExternItem {} #[derive(Debug, Clone, PartialEq, Eq, Hash)] pub enum AdtDef { - StructDef(StructDef), + Struct(Struct), EnumDef(EnumDef), Union(Union), } @@ -1520,8 +1520,8 @@ impl AstNode for StaticDef { } fn syntax(&self) -> &SyntaxNode { &self.syntax } } -impl AstNode for StructDef { - fn can_cast(kind: SyntaxKind) -> bool { kind == STRUCT_DEF } +impl AstNode for Struct { + fn can_cast(kind: SyntaxKind) -> bool { kind == STRUCT } fn cast(syntax: SyntaxNode) -> Option { if Self::can_cast(syntax.kind()) { Some(Self { syntax }) @@ -2801,8 +2801,8 @@ impl From for Item { impl From for Item { fn from(node: StaticDef) -> Item { Item::StaticDef(node) } } -impl From for Item { - fn from(node: StructDef) -> Item { Item::StructDef(node) } +impl From for Item { + fn from(node: Struct) -> Item { Item::Struct(node) } } impl From for Item { fn from(node: TraitDef) -> Item { Item::TraitDef(node) } @@ -2820,7 +2820,7 @@ impl AstNode for Item { fn can_cast(kind: SyntaxKind) -> bool { match kind { CONST_DEF | ENUM_DEF | EXTERN_BLOCK | EXTERN_CRATE | FN | IMPL_DEF | MACRO_CALL - | MODULE | STATIC_DEF | STRUCT_DEF | TRAIT_DEF | TYPE_ALIAS | UNION | USE => true, + | MODULE | STATIC_DEF | STRUCT | TRAIT_DEF | TYPE_ALIAS | UNION | USE => true, _ => false, } } @@ -2835,7 +2835,7 @@ impl AstNode for Item { MACRO_CALL => Item::MacroCall(MacroCall { syntax }), MODULE => Item::Module(Module { syntax }), STATIC_DEF => Item::StaticDef(StaticDef { syntax }), - STRUCT_DEF => Item::StructDef(StructDef { syntax }), + STRUCT => Item::Struct(Struct { syntax }), TRAIT_DEF => Item::TraitDef(TraitDef { syntax }), TYPE_ALIAS => Item::TypeAlias(TypeAlias { syntax }), UNION => Item::Union(Union { syntax }), @@ -2855,7 +2855,7 @@ impl AstNode for Item { Item::MacroCall(it) => &it.syntax, Item::Module(it) => &it.syntax, Item::StaticDef(it) => &it.syntax, - Item::StructDef(it) => &it.syntax, + Item::Struct(it) => &it.syntax, Item::TraitDef(it) => &it.syntax, Item::TypeAlias(it) => &it.syntax, Item::Union(it) => &it.syntax, @@ -3372,8 +3372,8 @@ impl AstNode for ExternItem { } } } -impl From for AdtDef { - fn from(node: StructDef) -> AdtDef { AdtDef::StructDef(node) } +impl From for AdtDef { + fn from(node: Struct) -> AdtDef { AdtDef::Struct(node) } } impl From for AdtDef { fn from(node: EnumDef) -> AdtDef { AdtDef::EnumDef(node) } @@ -3384,13 +3384,13 @@ impl From for AdtDef { impl AstNode for AdtDef { fn can_cast(kind: SyntaxKind) -> bool { match kind { - STRUCT_DEF | ENUM_DEF | UNION => true, + STRUCT | ENUM_DEF | UNION => true, _ => false, } } fn cast(syntax: SyntaxNode) -> Option { let res = match syntax.kind() { - STRUCT_DEF => AdtDef::StructDef(StructDef { syntax }), + STRUCT => AdtDef::Struct(Struct { syntax }), ENUM_DEF => AdtDef::EnumDef(EnumDef { syntax }), UNION => AdtDef::Union(Union { syntax }), _ => return None, @@ -3399,7 +3399,7 @@ impl AstNode for AdtDef { } fn syntax(&self) -> &SyntaxNode { match self { - AdtDef::StructDef(it) => &it.syntax, + AdtDef::Struct(it) => &it.syntax, AdtDef::EnumDef(it) => &it.syntax, AdtDef::Union(it) => &it.syntax, } @@ -3510,7 +3510,7 @@ impl std::fmt::Display for StaticDef { std::fmt::Display::fmt(self.syntax(), f) } } -impl std::fmt::Display for StructDef { +impl std::fmt::Display for Struct { 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 ce11a7513..2299988ce 100644 --- a/crates/ra_syntax/src/ast/node_ext.rs +++ b/crates/ra_syntax/src/ast/node_ext.rs @@ -183,7 +183,7 @@ impl StructKind { } } -impl ast::StructDef { +impl ast::Struct { pub fn kind(&self) -> StructKind { StructKind::from_node(self) } @@ -475,7 +475,7 @@ impl ast::TokenTree { impl ast::DocCommentsOwner for ast::SourceFile {} impl ast::DocCommentsOwner for ast::Fn {} -impl ast::DocCommentsOwner for ast::StructDef {} +impl ast::DocCommentsOwner for ast::Struct {} impl ast::DocCommentsOwner for ast::Union {} impl ast::DocCommentsOwner for ast::RecordField {} impl ast::DocCommentsOwner for ast::TupleField {} diff --git a/crates/ra_syntax/src/parsing/text_tree_sink.rs b/crates/ra_syntax/src/parsing/text_tree_sink.rs index 0a1246c59..ef260ea59 100644 --- a/crates/ra_syntax/src/parsing/text_tree_sink.rs +++ b/crates/ra_syntax/src/parsing/text_tree_sink.rs @@ -146,8 +146,8 @@ fn n_attached_trivias<'a>( trivias: impl Iterator, ) -> usize { match kind { - MACRO_CALL | CONST_DEF | TYPE_ALIAS | STRUCT_DEF | ENUM_DEF | ENUM_VARIANT | FN - | TRAIT_DEF | MODULE | RECORD_FIELD | STATIC_DEF => { + MACRO_CALL | CONST_DEF | TYPE_ALIAS | STRUCT | ENUM_DEF | ENUM_VARIANT | FN | TRAIT_DEF + | MODULE | RECORD_FIELD | STATIC_DEF => { let mut res = 0; let mut trivias = trivias.enumerate().peekable(); diff --git a/crates/ra_syntax/test_data/parser/err/0000_struct_field_missing_comma.rast b/crates/ra_syntax/test_data/parser/err/0000_struct_field_missing_comma.rast index 93f6060ed..bbbf496c8 100644 --- a/crates/ra_syntax/test_data/parser/err/0000_struct_field_missing_comma.rast +++ b/crates/ra_syntax/test_data/parser/err/0000_struct_field_missing_comma.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..34 - STRUCT_DEF@0..34 + STRUCT@0..34 STRUCT_KW@0..6 "struct" WHITESPACE@6..7 " " NAME@7..8 diff --git a/crates/ra_syntax/test_data/parser/err/0001_item_recovery_in_file.rast b/crates/ra_syntax/test_data/parser/err/0001_item_recovery_in_file.rast index 7e2f429e1..6dc73bfdb 100644 --- a/crates/ra_syntax/test_data/parser/err/0001_item_recovery_in_file.rast +++ b/crates/ra_syntax/test_data/parser/err/0001_item_recovery_in_file.rast @@ -5,7 +5,7 @@ SOURCE_FILE@0..21 ERROR@3..8 MATCH_KW@3..8 "match" WHITESPACE@8..10 "\n\n" - STRUCT_DEF@10..21 + STRUCT@10..21 STRUCT_KW@10..16 "struct" WHITESPACE@16..17 " " NAME@17..18 diff --git a/crates/ra_syntax/test_data/parser/err/0003_C++_semicolon.rast b/crates/ra_syntax/test_data/parser/err/0003_C++_semicolon.rast index e0f3916b3..7763fad84 100644 --- a/crates/ra_syntax/test_data/parser/err/0003_C++_semicolon.rast +++ b/crates/ra_syntax/test_data/parser/err/0003_C++_semicolon.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..40 - STRUCT_DEF@0..39 + STRUCT@0..39 STRUCT_KW@0..6 "struct" WHITESPACE@6..7 " " NAME@7..8 diff --git a/crates/ra_syntax/test_data/parser/err/0006_named_field_recovery.rast b/crates/ra_syntax/test_data/parser/err/0006_named_field_recovery.rast index ad9447761..5f85c3943 100644 --- a/crates/ra_syntax/test_data/parser/err/0006_named_field_recovery.rast +++ b/crates/ra_syntax/test_data/parser/err/0006_named_field_recovery.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..74 - STRUCT_DEF@0..73 + STRUCT@0..73 STRUCT_KW@0..6 "struct" WHITESPACE@6..7 " " NAME@7..8 diff --git a/crates/ra_syntax/test_data/parser/err/0007_stray_curly_in_file.rast b/crates/ra_syntax/test_data/parser/err/0007_stray_curly_in_file.rast index 2ae5bacea..560bfd751 100644 --- a/crates/ra_syntax/test_data/parser/err/0007_stray_curly_in_file.rast +++ b/crates/ra_syntax/test_data/parser/err/0007_stray_curly_in_file.rast @@ -2,7 +2,7 @@ SOURCE_FILE@0..31 ERROR@0..1 R_CURLY@0..1 "}" WHITESPACE@1..3 "\n\n" - STRUCT_DEF@3..12 + STRUCT@3..12 STRUCT_KW@3..9 "struct" WHITESPACE@9..10 " " NAME@10..11 diff --git a/crates/ra_syntax/test_data/parser/err/0009_broken_struct_type_parameter.rast b/crates/ra_syntax/test_data/parser/err/0009_broken_struct_type_parameter.rast index 10081a870..dacf71aa1 100644 --- a/crates/ra_syntax/test_data/parser/err/0009_broken_struct_type_parameter.rast +++ b/crates/ra_syntax/test_data/parser/err/0009_broken_struct_type_parameter.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..43 - STRUCT_DEF@0..11 + STRUCT@0..11 STRUCT_KW@0..6 "struct" WHITESPACE@6..7 " " NAME@7..8 @@ -38,7 +38,7 @@ SOURCE_FILE@0..43 WHITESPACE@29..30 "\n" R_CURLY@30..31 "}" WHITESPACE@31..33 "\n\n" - STRUCT_DEF@33..42 + STRUCT@33..42 STRUCT_KW@33..39 "struct" WHITESPACE@39..40 " " NAME@40..41 diff --git a/crates/ra_syntax/test_data/parser/err/0011_extern_struct.rast b/crates/ra_syntax/test_data/parser/err/0011_extern_struct.rast index 87c54c32c..b02d390af 100644 --- a/crates/ra_syntax/test_data/parser/err/0011_extern_struct.rast +++ b/crates/ra_syntax/test_data/parser/err/0011_extern_struct.rast @@ -3,7 +3,7 @@ SOURCE_FILE@0..19 ABI@0..6 EXTERN_KW@0..6 "extern" WHITESPACE@6..7 " " - STRUCT_DEF@7..18 + STRUCT@7..18 STRUCT_KW@7..13 "struct" WHITESPACE@13..14 " " NAME@14..17 diff --git a/crates/ra_syntax/test_data/parser/err/0013_invalid_type.rast b/crates/ra_syntax/test_data/parser/err/0013_invalid_type.rast index c3591d25c..3eef848fc 100644 --- a/crates/ra_syntax/test_data/parser/err/0013_invalid_type.rast +++ b/crates/ra_syntax/test_data/parser/err/0013_invalid_type.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..86 - STRUCT_DEF@0..72 + STRUCT@0..72 VISIBILITY@0..3 PUB_KW@0..3 "pub" WHITESPACE@3..4 " " 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 866f61113..02339d035 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 @@ -28,7 +28,7 @@ SOURCE_FILE@0..112 ERROR@17..18 COMMA@17..18 "," WHITESPACE@18..19 " " - STRUCT_DEF@19..26 + STRUCT@19..26 STRUCT_KW@19..25 "struct" ERROR@25..26 COMMA@25..26 "," diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0007_type_param_bounds.rast b/crates/ra_syntax/test_data/parser/inline/ok/0007_type_param_bounds.rast index 49aca06b0..e95688f56 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0007_type_param_bounds.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0007_type_param_bounds.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..35 - STRUCT_DEF@0..34 + STRUCT@0..34 STRUCT_KW@0..6 "struct" WHITESPACE@6..7 " " NAME@7..8 diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0022_crate_visibility.rast b/crates/ra_syntax/test_data/parser/inline/ok/0022_crate_visibility.rast index 1b810607e..50742cbcf 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0022_crate_visibility.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0022_crate_visibility.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..81 - STRUCT_DEF@0..20 + STRUCT@0..20 VISIBILITY@0..10 PUB_KW@0..3 "pub" L_PAREN@3..4 "(" @@ -12,7 +12,7 @@ SOURCE_FILE@0..81 IDENT@18..19 "S" SEMICOLON@19..20 ";" WHITESPACE@20..21 "\n" - STRUCT_DEF@21..40 + STRUCT@21..40 VISIBILITY@21..30 PUB_KW@21..24 "pub" L_PAREN@24..25 "(" @@ -25,7 +25,7 @@ SOURCE_FILE@0..81 IDENT@38..39 "S" SEMICOLON@39..40 ";" WHITESPACE@40..41 "\n" - STRUCT_DEF@41..60 + STRUCT@41..60 VISIBILITY@41..50 PUB_KW@41..44 "pub" L_PAREN@44..45 "(" @@ -38,7 +38,7 @@ SOURCE_FILE@0..81 IDENT@58..59 "S" SEMICOLON@59..60 ";" WHITESPACE@60..61 "\n" - STRUCT_DEF@61..80 + STRUCT@61..80 VISIBILITY@61..70 PUB_KW@61..64 "pub" L_PAREN@64..65 "(" diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0040_crate_keyword_vis.rast b/crates/ra_syntax/test_data/parser/inline/ok/0040_crate_keyword_vis.rast index a0ad07807..db5bd2849 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0040_crate_keyword_vis.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0040_crate_keyword_vis.rast @@ -16,7 +16,7 @@ SOURCE_FILE@0..71 WHITESPACE@17..18 " " R_CURLY@18..19 "}" WHITESPACE@19..20 "\n" - STRUCT_DEF@20..49 + STRUCT@20..49 STRUCT_KW@20..26 "struct" WHITESPACE@26..27 " " NAME@27..28 @@ -41,7 +41,7 @@ SOURCE_FILE@0..71 WHITESPACE@47..48 " " R_CURLY@48..49 "}" WHITESPACE@49..50 "\n" - STRUCT_DEF@50..70 + STRUCT@50..70 STRUCT_KW@50..56 "struct" WHITESPACE@56..57 " " NAME@57..58 diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0054_record_field_attrs.rast b/crates/ra_syntax/test_data/parser/inline/ok/0054_record_field_attrs.rast index 775bc2869..9ae271817 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0054_record_field_attrs.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0054_record_field_attrs.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..64 - STRUCT_DEF@0..63 + STRUCT@0..63 STRUCT_KW@0..6 "struct" WHITESPACE@6..7 " " NAME@7..8 diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0062_mod_contents.rast b/crates/ra_syntax/test_data/parser/inline/ok/0062_mod_contents.rast index f6417ab13..de8217064 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0062_mod_contents.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0062_mod_contents.rast @@ -57,7 +57,7 @@ SOURCE_FILE@0..70 L_CURLY@57..58 "{" R_CURLY@58..59 "}" WHITESPACE@59..60 "\n" - STRUCT_DEF@60..69 + STRUCT@60..69 STRUCT_KW@60..66 "struct" WHITESPACE@66..67 " " NAME@67..68 diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0083_struct_items.rast b/crates/ra_syntax/test_data/parser/inline/ok/0083_struct_items.rast index 0d9a36618..cdbc40fe0 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0083_struct_items.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0083_struct_items.rast @@ -1,12 +1,12 @@ SOURCE_FILE@0..106 - STRUCT_DEF@0..11 + STRUCT@0..11 STRUCT_KW@0..6 "struct" WHITESPACE@6..7 " " NAME@7..10 IDENT@7..10 "Foo" SEMICOLON@10..11 ";" WHITESPACE@11..12 "\n" - STRUCT_DEF@12..25 + STRUCT@12..25 STRUCT_KW@12..18 "struct" WHITESPACE@18..19 " " NAME@19..22 @@ -16,7 +16,7 @@ SOURCE_FILE@0..106 L_CURLY@23..24 "{" R_CURLY@24..25 "}" WHITESPACE@25..26 "\n" - STRUCT_DEF@26..39 + STRUCT@26..39 STRUCT_KW@26..32 "struct" WHITESPACE@32..33 " " NAME@33..36 @@ -26,7 +26,7 @@ SOURCE_FILE@0..106 R_PAREN@37..38 ")" SEMICOLON@38..39 ";" WHITESPACE@39..40 "\n" - STRUCT_DEF@40..66 + STRUCT@40..66 STRUCT_KW@40..46 "struct" WHITESPACE@46..47 " " NAME@47..50 @@ -50,7 +50,7 @@ SOURCE_FILE@0..106 R_PAREN@64..65 ")" SEMICOLON@65..66 ";" WHITESPACE@66..67 "\n" - STRUCT_DEF@67..105 + STRUCT@67..105 STRUCT_KW@67..73 "struct" WHITESPACE@73..74 " " NAME@74..77 diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0090_type_param_default.rast b/crates/ra_syntax/test_data/parser/inline/ok/0090_type_param_default.rast index 1d24619c3..2ef026e37 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0090_type_param_default.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0090_type_param_default.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..19 - STRUCT_DEF@0..18 + STRUCT@0..18 STRUCT_KW@0..6 "struct" WHITESPACE@6..7 " " NAME@7..8 diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0114_tuple_struct_where.rast b/crates/ra_syntax/test_data/parser/inline/ok/0114_tuple_struct_where.rast index 3c9af3d1f..0e1594dc4 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0114_tuple_struct_where.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0114_tuple_struct_where.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..53 - STRUCT_DEF@0..33 + STRUCT@0..33 STRUCT_KW@0..6 "struct" WHITESPACE@6..7 " " NAME@7..11 @@ -40,7 +40,7 @@ SOURCE_FILE@0..53 IDENT@27..32 "Clone" SEMICOLON@32..33 ";" WHITESPACE@33..34 "\n" - STRUCT_DEF@34..52 + STRUCT@34..52 STRUCT_KW@34..40 "struct" WHITESPACE@40..41 " " NAME@41..45 diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0115_tuple_field_attrs.rast b/crates/ra_syntax/test_data/parser/inline/ok/0115_tuple_field_attrs.rast index 51812a4f2..4d09c9f50 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0115_tuple_field_attrs.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0115_tuple_field_attrs.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..60 - STRUCT_DEF@0..59 + STRUCT@0..59 STRUCT_KW@0..6 "struct" WHITESPACE@6..7 " " NAME@7..8 diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0134_nocontentexpr_after_item.rast b/crates/ra_syntax/test_data/parser/inline/ok/0134_nocontentexpr_after_item.rast index d92bf84f4..280f947ce 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0134_nocontentexpr_after_item.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0134_nocontentexpr_after_item.rast @@ -47,7 +47,7 @@ SOURCE_FILE@0..111 R_CURLY@89..90 "}" SEMICOLON@90..91 ";" WHITESPACE@91..96 "\n " - STRUCT_DEF@96..107 + STRUCT@96..107 STRUCT_KW@96..102 "struct" WHITESPACE@102..103 " " NAME@103..104 diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0147_const_param.rast b/crates/ra_syntax/test_data/parser/inline/ok/0147_const_param.rast index 6981ef971..9312eab65 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0147_const_param.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0147_const_param.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..24 - STRUCT_DEF@0..23 + STRUCT@0..23 STRUCT_KW@0..6 "struct" WHITESPACE@6..7 " " NAME@7..8 diff --git a/crates/ra_syntax/test_data/parser/ok/0001_struct_item.rast b/crates/ra_syntax/test_data/parser/ok/0001_struct_item.rast index c9d1af92f..a171fe7a8 100644 --- a/crates/ra_syntax/test_data/parser/ok/0001_struct_item.rast +++ b/crates/ra_syntax/test_data/parser/ok/0001_struct_item.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..32 - STRUCT_DEF@0..31 + STRUCT@0..31 STRUCT_KW@0..6 "struct" WHITESPACE@6..7 " " NAME@7..8 diff --git a/crates/ra_syntax/test_data/parser/ok/0002_struct_item_field.rast b/crates/ra_syntax/test_data/parser/ok/0002_struct_item_field.rast index 57fb7a329..362892b91 100644 --- a/crates/ra_syntax/test_data/parser/ok/0002_struct_item_field.rast +++ b/crates/ra_syntax/test_data/parser/ok/0002_struct_item_field.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..25 - STRUCT_DEF@0..25 + STRUCT@0..25 STRUCT_KW@0..6 "struct" WHITESPACE@6..7 " " NAME@7..8 diff --git a/crates/ra_syntax/test_data/parser/ok/0008_mod_item.rast b/crates/ra_syntax/test_data/parser/ok/0008_mod_item.rast index 60ded78d5..b2c1d791f 100644 --- a/crates/ra_syntax/test_data/parser/ok/0008_mod_item.rast +++ b/crates/ra_syntax/test_data/parser/ok/0008_mod_item.rast @@ -40,7 +40,7 @@ SOURCE_FILE@0..118 WHITESPACE@41..46 "\n " R_CURLY@46..47 "}" WHITESPACE@47..52 "\n " - STRUCT_DEF@52..63 + STRUCT@52..63 STRUCT_KW@52..58 "struct" WHITESPACE@58..59 " " NAME@59..60 diff --git a/crates/ra_syntax/test_data/parser/ok/0016_struct_flavors.rast b/crates/ra_syntax/test_data/parser/ok/0016_struct_flavors.rast index 00b1b65be..b15f41dd7 100644 --- a/crates/ra_syntax/test_data/parser/ok/0016_struct_flavors.rast +++ b/crates/ra_syntax/test_data/parser/ok/0016_struct_flavors.rast @@ -1,12 +1,12 @@ SOURCE_FILE@0..97 - STRUCT_DEF@0..9 + STRUCT@0..9 STRUCT_KW@0..6 "struct" WHITESPACE@6..7 " " NAME@7..8 IDENT@7..8 "A" SEMICOLON@8..9 ";" WHITESPACE@9..10 "\n" - STRUCT_DEF@10..21 + STRUCT@10..21 STRUCT_KW@10..16 "struct" WHITESPACE@16..17 " " NAME@17..18 @@ -16,7 +16,7 @@ SOURCE_FILE@0..97 L_CURLY@19..20 "{" R_CURLY@20..21 "}" WHITESPACE@21..22 "\n" - STRUCT_DEF@22..33 + STRUCT@22..33 STRUCT_KW@22..28 "struct" WHITESPACE@28..29 " " NAME@29..30 @@ -26,7 +26,7 @@ SOURCE_FILE@0..97 R_PAREN@31..32 ")" SEMICOLON@32..33 ";" WHITESPACE@33..35 "\n\n" - STRUCT_DEF@35..74 + STRUCT@35..74 STRUCT_KW@35..41 "struct" WHITESPACE@41..42 " " NAME@42..43 @@ -63,7 +63,7 @@ SOURCE_FILE@0..97 WHITESPACE@72..73 "\n" R_CURLY@73..74 "}" WHITESPACE@74..76 "\n\n" - STRUCT_DEF@76..96 + STRUCT@76..96 STRUCT_KW@76..82 "struct" WHITESPACE@82..83 " " NAME@83..84 diff --git a/crates/ra_syntax/test_data/parser/ok/0018_struct_type_params.rast b/crates/ra_syntax/test_data/parser/ok/0018_struct_type_params.rast index b757bd16d..630aa0708 100644 --- a/crates/ra_syntax/test_data/parser/ok/0018_struct_type_params.rast +++ b/crates/ra_syntax/test_data/parser/ok/0018_struct_type_params.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..290 - STRUCT_DEF@0..13 + STRUCT@0..13 STRUCT_KW@0..6 "struct" WHITESPACE@6..7 " " NAME@7..9 @@ -12,7 +12,7 @@ SOURCE_FILE@0..290 R_ANGLE@11..12 ">" SEMICOLON@12..13 ";" WHITESPACE@13..14 "\n" - STRUCT_DEF@14..32 + STRUCT@14..32 STRUCT_KW@14..20 "struct" WHITESPACE@20..21 " " NAME@21..23 @@ -34,7 +34,7 @@ SOURCE_FILE@0..290 R_PAREN@30..31 ")" SEMICOLON@31..32 ";" WHITESPACE@32..33 "\n" - STRUCT_DEF@33..56 + STRUCT@33..56 STRUCT_KW@33..39 "struct" WHITESPACE@39..40 " " NAME@40..42 @@ -62,7 +62,7 @@ SOURCE_FILE@0..290 WHITESPACE@54..55 " " R_CURLY@55..56 "}" WHITESPACE@56..58 "\n\n" - STRUCT_DEF@58..70 + STRUCT@58..70 STRUCT_KW@58..64 "struct" WHITESPACE@64..65 " " NAME@65..67 @@ -72,7 +72,7 @@ SOURCE_FILE@0..290 R_ANGLE@68..69 ">" SEMICOLON@69..70 ";" WHITESPACE@70..71 "\n" - STRUCT_DEF@71..85 + STRUCT@71..85 STRUCT_KW@71..77 "struct" WHITESPACE@77..78 " " NAME@78..80 @@ -84,7 +84,7 @@ SOURCE_FILE@0..290 R_ANGLE@83..84 ">" SEMICOLON@84..85 ";" WHITESPACE@85..86 "\n" - STRUCT_DEF@86..101 + STRUCT@86..101 STRUCT_KW@86..92 "struct" WHITESPACE@92..93 " " NAME@93..95 @@ -97,7 +97,7 @@ SOURCE_FILE@0..290 R_ANGLE@99..100 ">" SEMICOLON@100..101 ";" WHITESPACE@101..102 "\n" - STRUCT_DEF@102..120 + STRUCT@102..120 STRUCT_KW@102..108 "struct" WHITESPACE@108..109 " " NAME@109..111 @@ -112,7 +112,7 @@ SOURCE_FILE@0..290 R_ANGLE@118..119 ">" SEMICOLON@119..120 ";" WHITESPACE@120..121 "\n" - STRUCT_DEF@121..142 + STRUCT@121..142 STRUCT_KW@121..127 "struct" WHITESPACE@127..128 " " NAME@128..130 @@ -130,7 +130,7 @@ SOURCE_FILE@0..290 R_ANGLE@140..141 ">" SEMICOLON@141..142 ";" WHITESPACE@142..143 "\n" - STRUCT_DEF@143..166 + STRUCT@143..166 STRUCT_KW@143..149 "struct" WHITESPACE@149..150 " " NAME@150..152 @@ -149,7 +149,7 @@ SOURCE_FILE@0..290 R_ANGLE@164..165 ">" SEMICOLON@165..166 ";" WHITESPACE@166..167 "\n" - STRUCT_DEF@167..183 + STRUCT@167..183 STRUCT_KW@167..173 "struct" WHITESPACE@173..174 " " NAME@174..177 @@ -162,7 +162,7 @@ SOURCE_FILE@0..290 R_ANGLE@181..182 ">" SEMICOLON@182..183 ";" WHITESPACE@183..184 "\n" - STRUCT_DEF@184..203 + STRUCT@184..203 STRUCT_KW@184..190 "struct" WHITESPACE@190..191 " " NAME@191..194 @@ -178,7 +178,7 @@ SOURCE_FILE@0..290 R_ANGLE@201..202 ">" SEMICOLON@202..203 ";" WHITESPACE@203..204 "\n" - STRUCT_DEF@204..233 + STRUCT@204..233 STRUCT_KW@204..210 "struct" WHITESPACE@210..211 " " NAME@211..214 @@ -202,7 +202,7 @@ SOURCE_FILE@0..290 R_ANGLE@231..232 ">" SEMICOLON@232..233 ";" WHITESPACE@233..235 "\n\n" - STRUCT_DEF@235..249 + STRUCT@235..249 STRUCT_KW@235..241 "struct" WHITESPACE@241..242 " " NAME@242..245 @@ -215,7 +215,7 @@ SOURCE_FILE@0..290 R_ANGLE@247..248 ">" SEMICOLON@248..249 ";" WHITESPACE@249..250 "\n" - STRUCT_DEF@250..267 + STRUCT@250..267 STRUCT_KW@250..256 "struct" WHITESPACE@256..257 " " NAME@257..260 @@ -233,7 +233,7 @@ SOURCE_FILE@0..290 R_ANGLE@265..266 ">" SEMICOLON@266..267 ";" WHITESPACE@267..268 "\n" - STRUCT_DEF@268..289 + STRUCT@268..289 STRUCT_KW@268..274 "struct" WHITESPACE@274..275 " " NAME@275..278 diff --git a/crates/ra_syntax/test_data/parser/ok/0020_type_param_bounds.rast b/crates/ra_syntax/test_data/parser/ok/0020_type_param_bounds.rast index 5100e6a48..9bdc50e1e 100644 --- a/crates/ra_syntax/test_data/parser/ok/0020_type_param_bounds.rast +++ b/crates/ra_syntax/test_data/parser/ok/0020_type_param_bounds.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..250 - STRUCT_DEF@0..12 + STRUCT@0..12 STRUCT_KW@0..6 "struct" WHITESPACE@6..7 " " NAME@7..8 @@ -12,7 +12,7 @@ SOURCE_FILE@0..250 R_ANGLE@10..11 ">" SEMICOLON@11..12 ";" WHITESPACE@12..13 "\n" - STRUCT_DEF@13..26 + STRUCT@13..26 STRUCT_KW@13..19 "struct" WHITESPACE@19..20 " " NAME@20..21 @@ -27,7 +27,7 @@ SOURCE_FILE@0..250 R_ANGLE@24..25 ">" SEMICOLON@25..26 ";" WHITESPACE@26..27 "\n" - STRUCT_DEF@27..43 + STRUCT@27..43 STRUCT_KW@27..33 "struct" WHITESPACE@33..34 " " NAME@34..35 @@ -45,7 +45,7 @@ SOURCE_FILE@0..250 R_ANGLE@41..42 ">" SEMICOLON@42..43 ";" WHITESPACE@43..44 "\n" - STRUCT_DEF@44..63 + STRUCT@44..63 STRUCT_KW@44..50 "struct" WHITESPACE@50..51 " " NAME@51..52 @@ -66,7 +66,7 @@ SOURCE_FILE@0..250 R_ANGLE@61..62 ">" SEMICOLON@62..63 ";" WHITESPACE@63..64 "\n" - STRUCT_DEF@64..86 + STRUCT@64..86 STRUCT_KW@64..70 "struct" WHITESPACE@70..71 " " NAME@71..72 @@ -90,7 +90,7 @@ SOURCE_FILE@0..250 R_ANGLE@84..85 ">" SEMICOLON@85..86 ";" WHITESPACE@86..87 "\n" - STRUCT_DEF@87..116 + STRUCT@87..116 STRUCT_KW@87..93 "struct" WHITESPACE@93..94 " " NAME@94..95 @@ -122,7 +122,7 @@ SOURCE_FILE@0..250 R_ANGLE@114..115 ">" SEMICOLON@115..116 ";" WHITESPACE@116..117 "\n" - STRUCT_DEF@117..143 + STRUCT@117..143 STRUCT_KW@117..123 "struct" WHITESPACE@123..124 " " NAME@124..125 @@ -153,7 +153,7 @@ SOURCE_FILE@0..250 R_ANGLE@141..142 ">" SEMICOLON@142..143 ";" WHITESPACE@143..144 "\n" - STRUCT_DEF@144..180 + STRUCT@144..180 STRUCT_KW@144..150 "struct" WHITESPACE@150..151 " " NAME@151..152 @@ -194,7 +194,7 @@ SOURCE_FILE@0..250 R_ANGLE@178..179 ">" SEMICOLON@179..180 ";" WHITESPACE@180..181 "\n" - STRUCT_DEF@181..199 + STRUCT@181..199 STRUCT_KW@181..187 "struct" WHITESPACE@187..188 " " NAME@188..189 @@ -217,7 +217,7 @@ SOURCE_FILE@0..250 R_ANGLE@197..198 ">" SEMICOLON@198..199 ";" WHITESPACE@199..200 "\n" - STRUCT_DEF@200..250 + STRUCT@200..250 STRUCT_KW@200..206 "struct" WHITESPACE@206..207 " " NAME@207..208 diff --git a/crates/ra_syntax/test_data/parser/ok/0040_raw_struct_item_field.rast b/crates/ra_syntax/test_data/parser/ok/0040_raw_struct_item_field.rast index 0f0138c86..8cfc14f49 100644 --- a/crates/ra_syntax/test_data/parser/ok/0040_raw_struct_item_field.rast +++ b/crates/ra_syntax/test_data/parser/ok/0040_raw_struct_item_field.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..27 - STRUCT_DEF@0..27 + STRUCT@0..27 STRUCT_KW@0..6 "struct" WHITESPACE@6..7 " " NAME@7..8 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 4f0c68822..c4ffc0a3d 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 @@ -1,7 +1,7 @@ SOURCE_FILE@0..199 COMMENT@0..60 "// https://github.com ..." WHITESPACE@60..62 "\n\n" - STRUCT_DEF@62..73 + STRUCT@62..73 STRUCT_KW@62..68 "struct" WHITESPACE@68..69 " " NAME@69..72 diff --git a/crates/ra_syntax/test_data/parser/ok/0043_complex_assignment.rast b/crates/ra_syntax/test_data/parser/ok/0043_complex_assignment.rast index 9c2ea3754..adc4a22e9 100644 --- a/crates/ra_syntax/test_data/parser/ok/0043_complex_assignment.rast +++ b/crates/ra_syntax/test_data/parser/ok/0043_complex_assignment.rast @@ -1,7 +1,7 @@ SOURCE_FILE@0..160 COMMENT@0..60 "// https://github.com ..." WHITESPACE@60..62 "\n\n" - STRUCT_DEF@62..90 + STRUCT@62..90 STRUCT_KW@62..68 "struct" WHITESPACE@68..69 " " NAME@69..73 -- cgit v1.2.3