diff options
Diffstat (limited to 'crates/ra_syntax')
29 files changed, 53 insertions, 53 deletions
diff --git a/crates/ra_syntax/src/ast/edit.rs b/crates/ra_syntax/src/ast/edit.rs index 8d3e42f25..04746ef8f 100644 --- a/crates/ra_syntax/src/ast/edit.rs +++ b/crates/ra_syntax/src/ast/edit.rs | |||
@@ -237,17 +237,17 @@ impl ast::Path { | |||
237 | 237 | ||
238 | impl ast::PathSegment { | 238 | impl ast::PathSegment { |
239 | #[must_use] | 239 | #[must_use] |
240 | pub fn with_type_args(&self, type_args: ast::TypeArgList) -> ast::PathSegment { | 240 | pub fn with_type_args(&self, type_args: ast::GenericArgList) -> ast::PathSegment { |
241 | self._with_type_args(type_args, false) | 241 | self._with_type_args(type_args, false) |
242 | } | 242 | } |
243 | 243 | ||
244 | #[must_use] | 244 | #[must_use] |
245 | pub fn with_turbo_fish(&self, type_args: ast::TypeArgList) -> ast::PathSegment { | 245 | pub fn with_turbo_fish(&self, type_args: ast::GenericArgList) -> ast::PathSegment { |
246 | self._with_type_args(type_args, true) | 246 | self._with_type_args(type_args, true) |
247 | } | 247 | } |
248 | 248 | ||
249 | fn _with_type_args(&self, type_args: ast::TypeArgList, turbo: bool) -> ast::PathSegment { | 249 | fn _with_type_args(&self, type_args: ast::GenericArgList, turbo: bool) -> ast::PathSegment { |
250 | if let Some(old) = self.type_arg_list() { | 250 | if let Some(old) = self.generic_arg_list() { |
251 | return self.replace_children( | 251 | return self.replace_children( |
252 | single_node(old.syntax().clone()), | 252 | single_node(old.syntax().clone()), |
253 | iter::once(type_args.syntax().clone().into()), | 253 | iter::once(type_args.syntax().clone().into()), |
diff --git a/crates/ra_syntax/src/ast/generated/nodes.rs b/crates/ra_syntax/src/ast/generated/nodes.rs index 1a707ad67..903646149 100644 --- a/crates/ra_syntax/src/ast/generated/nodes.rs +++ b/crates/ra_syntax/src/ast/generated/nodes.rs | |||
@@ -24,7 +24,7 @@ impl PathSegment { | |||
24 | pub fn self_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![self]) } | 24 | pub fn self_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![self]) } |
25 | pub fn super_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![super]) } | 25 | pub fn super_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![super]) } |
26 | pub fn name_ref(&self) -> Option<NameRef> { support::child(&self.syntax) } | 26 | pub fn name_ref(&self) -> Option<NameRef> { support::child(&self.syntax) } |
27 | pub fn type_arg_list(&self) -> Option<TypeArgList> { support::child(&self.syntax) } | 27 | pub fn generic_arg_list(&self) -> Option<GenericArgList> { support::child(&self.syntax) } |
28 | pub fn param_list(&self) -> Option<ParamList> { support::child(&self.syntax) } | 28 | pub fn param_list(&self) -> Option<ParamList> { support::child(&self.syntax) } |
29 | pub fn ret_type(&self) -> Option<RetType> { support::child(&self.syntax) } | 29 | pub fn ret_type(&self) -> Option<RetType> { support::child(&self.syntax) } |
30 | pub fn l_angle_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![<]) } | 30 | pub fn l_angle_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![<]) } |
@@ -40,10 +40,10 @@ impl NameRef { | |||
40 | pub fn ident_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![ident]) } | 40 | pub fn ident_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![ident]) } |
41 | } | 41 | } |
42 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] | 42 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] |
43 | pub struct TypeArgList { | 43 | pub struct GenericArgList { |
44 | pub(crate) syntax: SyntaxNode, | 44 | pub(crate) syntax: SyntaxNode, |
45 | } | 45 | } |
46 | impl TypeArgList { | 46 | impl GenericArgList { |
47 | pub fn coloncolon_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![::]) } | 47 | pub fn coloncolon_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![::]) } |
48 | pub fn l_angle_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![<]) } | 48 | pub fn l_angle_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![<]) } |
49 | pub fn type_args(&self) -> AstChildren<TypeArg> { support::children(&self.syntax) } | 49 | pub fn type_args(&self) -> AstChildren<TypeArg> { support::children(&self.syntax) } |
@@ -803,7 +803,7 @@ impl MethodCallExpr { | |||
803 | pub fn expr(&self) -> Option<Expr> { support::child(&self.syntax) } | 803 | pub fn expr(&self) -> Option<Expr> { support::child(&self.syntax) } |
804 | pub fn dot_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![.]) } | 804 | pub fn dot_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![.]) } |
805 | pub fn name_ref(&self) -> Option<NameRef> { support::child(&self.syntax) } | 805 | pub fn name_ref(&self) -> Option<NameRef> { support::child(&self.syntax) } |
806 | pub fn type_arg_list(&self) -> Option<TypeArgList> { support::child(&self.syntax) } | 806 | pub fn generic_arg_list(&self) -> Option<GenericArgList> { support::child(&self.syntax) } |
807 | } | 807 | } |
808 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] | 808 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] |
809 | pub struct ParenExpr { | 809 | pub struct ParenExpr { |
@@ -1434,8 +1434,8 @@ impl AstNode for NameRef { | |||
1434 | } | 1434 | } |
1435 | fn syntax(&self) -> &SyntaxNode { &self.syntax } | 1435 | fn syntax(&self) -> &SyntaxNode { &self.syntax } |
1436 | } | 1436 | } |
1437 | impl AstNode for TypeArgList { | 1437 | impl AstNode for GenericArgList { |
1438 | fn can_cast(kind: SyntaxKind) -> bool { kind == TYPE_ARG_LIST } | 1438 | fn can_cast(kind: SyntaxKind) -> bool { kind == GENERIC_ARG_LIST } |
1439 | fn cast(syntax: SyntaxNode) -> Option<Self> { | 1439 | fn cast(syntax: SyntaxNode) -> Option<Self> { |
1440 | if Self::can_cast(syntax.kind()) { | 1440 | if Self::can_cast(syntax.kind()) { |
1441 | Some(Self { syntax }) | 1441 | Some(Self { syntax }) |
@@ -3445,7 +3445,7 @@ impl std::fmt::Display for NameRef { | |||
3445 | std::fmt::Display::fmt(self.syntax(), f) | 3445 | std::fmt::Display::fmt(self.syntax(), f) |
3446 | } | 3446 | } |
3447 | } | 3447 | } |
3448 | impl std::fmt::Display for TypeArgList { | 3448 | impl std::fmt::Display for GenericArgList { |
3449 | fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { | 3449 | fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { |
3450 | std::fmt::Display::fmt(self.syntax(), f) | 3450 | std::fmt::Display::fmt(self.syntax(), f) |
3451 | } | 3451 | } |
diff --git a/crates/ra_syntax/test_data/parser/err/0012_broken_lambda.rast b/crates/ra_syntax/test_data/parser/err/0012_broken_lambda.rast index 0afa24b77..307d9b31b 100644 --- a/crates/ra_syntax/test_data/parser/err/0012_broken_lambda.rast +++ b/crates/ra_syntax/test_data/parser/err/0012_broken_lambda.rast | |||
@@ -25,7 +25,7 @@ [email protected] | |||
25 | [email protected] | 25 | [email protected] |
26 | [email protected] | 26 | [email protected] |
27 | [email protected] "Sink" | 27 | [email protected] "Sink" |
28 | TYP[email protected] | 28 | GENERIC[email protected] |
29 | [email protected] | 29 | [email protected] |
30 | [email protected] | 30 | [email protected] |
31 | [email protected] "'a" | 31 | [email protected] "'a" |
@@ -79,7 +79,7 @@ [email protected] | |||
79 | [email protected] | 79 | [email protected] |
80 | [email protected] | 80 | [email protected] |
81 | [email protected] "Vec" | 81 | [email protected] "Vec" |
82 | TYP[email protected] | 82 | GENERIC[email protected] |
83 | [email protected] | 83 | [email protected] |
84 | [email protected] | 84 | [email protected] |
85 | [email protected] | 85 | [email protected] |
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 3eef848fc..f48ab6e71 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 | |||
@@ -16,7 +16,7 @@ [email protected] | |||
16 | [email protected] | 16 | [email protected] |
17 | [email protected] | 17 | [email protected] |
18 | [email protected] "RefCell" | 18 | [email protected] "RefCell" |
19 | TYP[email protected] | 19 | GENERIC[email protected] |
20 | [email protected] "<" | 20 | [email protected] "<" |
21 | [email protected] | 21 | [email protected] |
22 | [email protected] | 22 | [email protected] |
@@ -24,7 +24,7 @@ [email protected] | |||
24 | [email protected] | 24 | [email protected] |
25 | [email protected] | 25 | [email protected] |
26 | [email protected] "HashMap" | 26 | [email protected] "HashMap" |
27 | TYP[email protected] | 27 | GENERIC[email protected] |
28 | [email protected] "<" | 28 | [email protected] "<" |
29 | [email protected] "\n " | 29 | [email protected] "\n " |
30 | [email protected] | 30 | [email protected] |
@@ -41,7 +41,7 @@ [email protected] | |||
41 | [email protected] | 41 | [email protected] |
42 | [email protected] | 42 | [email protected] |
43 | [email protected] "Box" | 43 | [email protected] "Box" |
44 | TYP[email protected] | 44 | GENERIC[email protected] |
45 | [email protected] "<" | 45 | [email protected] "<" |
46 | [email protected] | 46 | [email protected] |
47 | [email protected] | 47 | [email protected] |
diff --git a/crates/ra_syntax/test_data/parser/err/0024_many_type_parens.rast b/crates/ra_syntax/test_data/parser/err/0024_many_type_parens.rast index 4c2d1ad68..1cb1e9757 100644 --- a/crates/ra_syntax/test_data/parser/err/0024_many_type_parens.rast +++ b/crates/ra_syntax/test_data/parser/err/0024_many_type_parens.rast | |||
@@ -50,7 +50,7 @@ [email protected] | |||
50 | [email protected] | 50 | [email protected] |
51 | [email protected] | 51 | [email protected] |
52 | [email protected] "Trait" | 52 | [email protected] "Trait" |
53 | TYP[email protected] | 53 | GENERIC[email protected] |
54 | [email protected] "<" | 54 | [email protected] "<" |
55 | [email protected] | 55 | [email protected] |
56 | [email protected] "\'a" | 56 | [email protected] "\'a" |
@@ -92,7 +92,7 @@ [email protected] | |||
92 | [email protected] | 92 | [email protected] |
93 | [email protected] | 93 | [email protected] |
94 | [email protected] "Box" | 94 | [email protected] "Box" |
95 | TYP[email protected] | 95 | GENERIC[email protected] |
96 | [email protected] "<" | 96 | [email protected] "<" |
97 | [email protected] | 97 | [email protected] |
98 | [email protected] | 98 | [email protected] |
@@ -133,7 +133,7 @@ [email protected] | |||
133 | [email protected] | 133 | [email protected] |
134 | [email protected] | 134 | [email protected] |
135 | [email protected] "Trait" | 135 | [email protected] "Trait" |
136 | TYP[email protected] | 136 | GENERIC[email protected] |
137 | [email protected] "<" | 137 | [email protected] "<" |
138 | [email protected] | 138 | [email protected] |
139 | [email protected] "\'a" | 139 | [email protected] "\'a" |
@@ -156,7 +156,7 @@ [email protected] | |||
156 | [email protected] | 156 | [email protected] |
157 | [email protected] | 157 | [email protected] |
158 | [email protected] "Box" | 158 | [email protected] "Box" |
159 | TYP[email protected] | 159 | GENERIC[email protected] |
160 | [email protected] "<" | 160 | [email protected] "<" |
161 | [email protected] | 161 | [email protected] |
162 | [email protected] | 162 | [email protected] |
@@ -235,7 +235,7 @@ [email protected] | |||
235 | [email protected] | 235 | [email protected] |
236 | [email protected] | 236 | [email protected] |
237 | [email protected] "Box" | 237 | [email protected] "Box" |
238 | TYP[email protected] | 238 | GENERIC[email protected] |
239 | [email protected] "<" | 239 | [email protected] "<" |
240 | [email protected] | 240 | [email protected] |
241 | [email protected] | 241 | [email protected] |
@@ -253,7 +253,7 @@ [email protected] | |||
253 | [email protected] | 253 | [email protected] |
254 | [email protected] | 254 | [email protected] |
255 | [email protected] "Trait" | 255 | [email protected] "Trait" |
256 | TYP[email protected] | 256 | GENERIC[email protected] |
257 | [email protected] "<" | 257 | [email protected] "<" |
258 | [email protected] | 258 | [email protected] |
259 | [email protected] "\'a" | 259 | [email protected] "\'a" |
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 7e4b11c27..1b08c834e 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 | |||
@@ -31,7 +31,7 @@ [email protected] | |||
31 | [email protected] | 31 | [email protected] |
32 | [email protected] | 32 | [email protected] |
33 | [email protected] "OnceCell" | 33 | [email protected] "OnceCell" |
34 | TYP[email protected] | 34 | GENERIC[email protected] |
35 | [email protected] "<" | 35 | [email protected] "<" |
36 | [email protected] | 36 | [email protected] |
37 | [email protected] | 37 | [email protected] |
diff --git a/crates/ra_syntax/test_data/parser/err/0039_lambda_recovery.rast b/crates/ra_syntax/test_data/parser/err/0039_lambda_recovery.rast index 0678d4278..7a5e115bc 100644 --- a/crates/ra_syntax/test_data/parser/err/0039_lambda_recovery.rast +++ b/crates/ra_syntax/test_data/parser/err/0039_lambda_recovery.rast | |||
@@ -62,7 +62,7 @@ [email protected] | |||
62 | [email protected] "." | 62 | [email protected] "." |
63 | [email protected] | 63 | [email protected] |
64 | [email protected] "max" | 64 | [email protected] "max" |
65 | TYP[email protected] | 65 | GENERIC[email protected] |
66 | [email protected] "::" | 66 | [email protected] "::" |
67 | [email protected] "<" | 67 | [email protected] "<" |
68 | [email protected] | 68 | [email protected] |
diff --git a/crates/ra_syntax/test_data/parser/fragments/type/ok/0000_result.rast b/crates/ra_syntax/test_data/parser/fragments/type/ok/0000_result.rast index 8831cfa6c..38c15b581 100644 --- a/crates/ra_syntax/test_data/parser/fragments/type/ok/0000_result.rast +++ b/crates/ra_syntax/test_data/parser/fragments/type/ok/0000_result.rast | |||
@@ -3,7 +3,7 @@ [email protected] | |||
3 | [email protected] | 3 | [email protected] |
4 | [email protected] | 4 | [email protected] |
5 | [email protected] "Result" | 5 | [email protected] "Result" |
6 | TYP[email protected] | 6 | GENERIC[email protected] |
7 | [email protected] "<" | 7 | [email protected] "<" |
8 | [email protected] | 8 | [email protected] |
9 | [email protected] | 9 | [email protected] |
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0004_value_parameters_no_patterns.rast b/crates/ra_syntax/test_data/parser/inline/ok/0004_value_parameters_no_patterns.rast index ace8ad050..44d92aedb 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0004_value_parameters_no_patterns.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0004_value_parameters_no_patterns.rast | |||
@@ -12,7 +12,7 @@ [email protected] | |||
12 | [email protected] | 12 | [email protected] |
13 | [email protected] | 13 | [email protected] |
14 | [email protected] "Box" | 14 | [email protected] "Box" |
15 | TYP[email protected] | 15 | GENERIC[email protected] |
16 | [email protected] "<" | 16 | [email protected] "<" |
17 | [email protected] | 17 | [email protected] |
18 | [email protected] | 18 | [email protected] |
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 20b2b6c19..1b31aa95a 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 | |||
@@ -53,7 +53,7 @@ [email protected] | |||
53 | [email protected] | 53 | [email protected] |
54 | [email protected] | 54 | [email protected] |
55 | [email protected] "Box" | 55 | [email protected] "Box" |
56 | TYP[email protected] | 56 | GENERIC[email protected] |
57 | [email protected] "<" | 57 | [email protected] "<" |
58 | [email protected] | 58 | [email protected] |
59 | [email protected] | 59 | [email protected] |
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0028_impl_trait_type.rast b/crates/ra_syntax/test_data/parser/inline/ok/0028_impl_trait_type.rast index f45f3cab8..32b2959bd 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0028_impl_trait_type.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0028_impl_trait_type.rast | |||
@@ -17,7 +17,7 @@ [email protected] | |||
17 | [email protected] | 17 | [email protected] |
18 | [email protected] | 18 | [email protected] |
19 | [email protected] "Iterator" | 19 | [email protected] "Iterator" |
20 | TYP[email protected] | 20 | GENERIC[email protected] |
21 | [email protected] "<" | 21 | [email protected] "<" |
22 | [email protected] | 22 | [email protected] |
23 | [email protected] | 23 | [email protected] |
@@ -28,7 +28,7 @@ [email protected] | |||
28 | [email protected] | 28 | [email protected] |
29 | [email protected] | 29 | [email protected] |
30 | [email protected] "Foo" | 30 | [email protected] "Foo" |
31 | TYP[email protected] | 31 | GENERIC[email protected] |
32 | [email protected] "<" | 32 | [email protected] "<" |
33 | [email protected] | 33 | [email protected] |
34 | [email protected] "\'a" | 34 | [email protected] "\'a" |
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0039_type_arg.rast b/crates/ra_syntax/test_data/parser/inline/ok/0039_type_arg.rast index 2185d3c91..b9381abdc 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0039_type_arg.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0039_type_arg.rast | |||
@@ -12,7 +12,7 @@ [email protected] | |||
12 | [email protected] | 12 | [email protected] |
13 | [email protected] | 13 | [email protected] |
14 | [email protected] "B" | 14 | [email protected] "B" |
15 | TYP[email protected] | 15 | GENERIC[email protected] |
16 | [email protected] "<" | 16 | [email protected] "<" |
17 | [email protected] | 17 | [email protected] |
18 | [email protected] "\'static" | 18 | [email protected] "\'static" |
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0045_param_list_opt_patterns.rast b/crates/ra_syntax/test_data/parser/inline/ok/0045_param_list_opt_patterns.rast index d4235a8b1..c100d1c71 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0045_param_list_opt_patterns.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0045_param_list_opt_patterns.rast | |||
@@ -30,7 +30,7 @@ [email protected] | |||
30 | [email protected] | 30 | [email protected] |
31 | [email protected] | 31 | [email protected] |
32 | [email protected] "Foo" | 32 | [email protected] "Foo" |
33 | TYP[email protected] | 33 | GENERIC[email protected] |
34 | [email protected] "<" | 34 | [email protected] "<" |
35 | [email protected] | 35 | [email protected] |
36 | [email protected] "\'a" | 36 | [email protected] "\'a" |
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0048_path_type_with_bounds.rast b/crates/ra_syntax/test_data/parser/inline/ok/0048_path_type_with_bounds.rast index 37757ccd4..4d8404e7c 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0048_path_type_with_bounds.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0048_path_type_with_bounds.rast | |||
@@ -16,7 +16,7 @@ [email protected] | |||
16 | [email protected] | 16 | [email protected] |
17 | [email protected] | 17 | [email protected] |
18 | [email protected] "Box" | 18 | [email protected] "Box" |
19 | TYP[email protected] | 19 | GENERIC[email protected] |
20 | [email protected] "<" | 20 | [email protected] "<" |
21 | [email protected] | 21 | [email protected] |
22 | [email protected] | 22 | [email protected] |
@@ -55,7 +55,7 @@ [email protected] | |||
55 | [email protected] | 55 | [email protected] |
56 | [email protected] | 56 | [email protected] |
57 | [email protected] "Box" | 57 | [email protected] "Box" |
58 | TYP[email protected] | 58 | GENERIC[email protected] |
59 | [email protected] "<" | 59 | [email protected] "<" |
60 | [email protected] | 60 | [email protected] |
61 | [email protected] | 61 | [email protected] |
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0053_path_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0053_path_expr.rast index 2bfb52453..de2016f18 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0053_path_expr.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0053_path_expr.rast | |||
@@ -60,7 +60,7 @@ [email protected] | |||
60 | [email protected] "::" | 60 | [email protected] "::" |
61 | [email protected] | 61 | [email protected] |
62 | [email protected] "a" | 62 | [email protected] "a" |
63 | TYP[email protected] | 63 | GENERIC[email protected] |
64 | [email protected] "::" | 64 | [email protected] "::" |
65 | [email protected] "<" | 65 | [email protected] "<" |
66 | [email protected] | 66 | [email protected] |
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0065_dyn_trait_type.rast b/crates/ra_syntax/test_data/parser/inline/ok/0065_dyn_trait_type.rast index 629fea99d..3a7fcfe24 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0065_dyn_trait_type.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0065_dyn_trait_type.rast | |||
@@ -17,7 +17,7 @@ [email protected] | |||
17 | [email protected] | 17 | [email protected] |
18 | [email protected] | 18 | [email protected] |
19 | [email protected] "Iterator" | 19 | [email protected] "Iterator" |
20 | TYP[email protected] | 20 | GENERIC[email protected] |
21 | [email protected] "<" | 21 | [email protected] "<" |
22 | [email protected] | 22 | [email protected] |
23 | [email protected] | 23 | [email protected] |
@@ -28,7 +28,7 @@ [email protected] | |||
28 | [email protected] | 28 | [email protected] |
29 | [email protected] | 29 | [email protected] |
30 | [email protected] "Foo" | 30 | [email protected] "Foo" |
31 | TYP[email protected] | 31 | GENERIC[email protected] |
32 | [email protected] "<" | 32 | [email protected] "<" |
33 | [email protected] | 33 | [email protected] |
34 | [email protected] "\'a" | 34 | [email protected] "\'a" |
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0081_for_type.rast b/crates/ra_syntax/test_data/parser/inline/ok/0081_for_type.rast index e7629ac03..5f4807522 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0081_for_type.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0081_for_type.rast | |||
@@ -95,7 +95,7 @@ [email protected] | |||
95 | [email protected] | 95 | [email protected] |
96 | [email protected] | 96 | [email protected] |
97 | [email protected] "PartialEq" | 97 | [email protected] "PartialEq" |
98 | TYP[email protected] | 98 | GENERIC[email protected] |
99 | [email protected] "<" | 99 | [email protected] "<" |
100 | [email protected] | 100 | [email protected] |
101 | [email protected] | 101 | [email protected] |
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0104_path_fn_trait_args.rast b/crates/ra_syntax/test_data/parser/inline/ok/0104_path_fn_trait_args.rast index 3f53d60c0..1244a5031 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0104_path_fn_trait_args.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0104_path_fn_trait_args.rast | |||
@@ -12,7 +12,7 @@ [email protected] | |||
12 | [email protected] | 12 | [email protected] |
13 | [email protected] | 13 | [email protected] |
14 | [email protected] "Box" | 14 | [email protected] "Box" |
15 | TYP[email protected] | 15 | GENERIC[email protected] |
16 | [email protected] "<" | 16 | [email protected] "<" |
17 | [email protected] | 17 | [email protected] |
18 | [email protected] | 18 | [email protected] |
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0107_method_call_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0107_method_call_expr.rast index b2961b0ff..be8365e05 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0107_method_call_expr.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0107_method_call_expr.rast | |||
@@ -36,7 +36,7 @@ [email protected] | |||
36 | [email protected] "." | 36 | [email protected] "." |
37 | [email protected] | 37 | [email protected] |
38 | [email protected] "bar" | 38 | [email protected] "bar" |
39 | TYP[email protected] | 39 | GENERIC[email protected] |
40 | [email protected] "::" | 40 | [email protected] "::" |
41 | [email protected] "<" | 41 | [email protected] "<" |
42 | [email protected] | 42 | [email protected] |
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0138_associated_type_bounds.rast b/crates/ra_syntax/test_data/parser/inline/ok/0138_associated_type_bounds.rast index 157513565..e0a82df75 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0138_associated_type_bounds.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0138_associated_type_bounds.rast | |||
@@ -18,7 +18,7 @@ [email protected] | |||
18 | [email protected] | 18 | [email protected] |
19 | [email protected] | 19 | [email protected] |
20 | [email protected] "Iterator" | 20 | [email protected] "Iterator" |
21 | TYP[email protected] | 21 | GENERIC[email protected] |
22 | [email protected] "<" | 22 | [email protected] "<" |
23 | [email protected] | 23 | [email protected] |
24 | [email protected] | 24 | [email protected] |
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 8f197a19d..12194abda 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 | |||
@@ -22,7 +22,7 @@ [email protected] | |||
22 | [email protected] | 22 | [email protected] |
23 | [email protected] | 23 | [email protected] |
24 | [email protected] "Bar" | 24 | [email protected] "Bar" |
25 | TYP[email protected] | 25 | GENERIC[email protected] |
26 | [email protected] "<" | 26 | [email protected] "<" |
27 | [email protected] | 27 | [email protected] |
28 | [email protected] | 28 | [email protected] |
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0151_trait_alias.rast b/crates/ra_syntax/test_data/parser/inline/ok/0151_trait_alias.rast index cc220e534..dac50410e 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0151_trait_alias.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0151_trait_alias.rast | |||
@@ -20,7 +20,7 @@ [email protected] | |||
20 | [email protected] | 20 | [email protected] |
21 | [email protected] | 21 | [email protected] |
22 | [email protected] "T" | 22 | [email protected] "T" |
23 | TYP[email protected] | 23 | GENERIC[email protected] |
24 | [email protected] "<" | 24 | [email protected] "<" |
25 | [email protected] | 25 | [email protected] |
26 | [email protected] | 26 | [email protected] |
@@ -52,7 +52,7 @@ [email protected] | |||
52 | [email protected] | 52 | [email protected] |
53 | [email protected] | 53 | [email protected] |
54 | [email protected] "T" | 54 | [email protected] "T" |
55 | TYP[email protected] | 55 | GENERIC[email protected] |
56 | [email protected] "<" | 56 | [email protected] "<" |
57 | [email protected] | 57 | [email protected] |
58 | [email protected] | 58 | [email protected] |
@@ -115,7 +115,7 @@ [email protected] | |||
115 | [email protected] | 115 | [email protected] |
116 | [email protected] | 116 | [email protected] |
117 | [email protected] "T" | 117 | [email protected] "T" |
118 | TYP[email protected] | 118 | GENERIC[email protected] |
119 | [email protected] "<" | 119 | [email protected] "<" |
120 | [email protected] | 120 | [email protected] |
121 | [email protected] | 121 | [email protected] |
diff --git a/crates/ra_syntax/test_data/parser/ok/0032_where_for.rast b/crates/ra_syntax/test_data/parser/ok/0032_where_for.rast index 10da87c71..d59548f21 100644 --- a/crates/ra_syntax/test_data/parser/ok/0032_where_for.rast +++ b/crates/ra_syntax/test_data/parser/ok/0032_where_for.rast | |||
@@ -49,7 +49,7 @@ [email protected] | |||
49 | [email protected] | 49 | [email protected] |
50 | [email protected] | 50 | [email protected] |
51 | [email protected] "Deserialize" | 51 | [email protected] "Deserialize" |
52 | TYP[email protected] | 52 | GENERIC[email protected] |
53 | [email protected] "<" | 53 | [email protected] "<" |
54 | [email protected] | 54 | [email protected] |
55 | [email protected] "\'de" | 55 | [email protected] "\'de" |
diff --git a/crates/ra_syntax/test_data/parser/ok/0035_weird_exprs.rast b/crates/ra_syntax/test_data/parser/ok/0035_weird_exprs.rast index 1d75ed08f..0e0c8c9dc 100644 --- a/crates/ra_syntax/test_data/parser/ok/0035_weird_exprs.rast +++ b/crates/ra_syntax/test_data/parser/ok/0035_weird_exprs.rast | |||
@@ -249,7 +249,7 @@ [email protected] | |||
249 | [email protected] | 249 | [email protected] |
250 | [email protected] | 250 | [email protected] |
251 | [email protected] "Cell" | 251 | [email protected] "Cell" |
252 | TYP[email protected] | 252 | GENERIC[email protected] |
253 | [email protected] "<" | 253 | [email protected] "<" |
254 | [email protected] | 254 | [email protected] |
255 | [email protected] | 255 | [email protected] |
@@ -1588,7 +1588,7 @@ [email protected] | |||
1588 | [email protected] | 1588 | [email protected] |
1589 | [email protected] | 1589 | [email protected] |
1590 | [email protected] "union" | 1590 | [email protected] "union" |
1591 | TYP[email protected] | 1591 | GENERIC[email protected] |
1592 | [email protected] "<" | 1592 | [email protected] "<" |
1593 | [email protected] | 1593 | [email protected] |
1594 | [email protected] "\'union" | 1594 | [email protected] "\'union" |
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 139ce9046..bd152ffa3 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 | |||
@@ -141,7 +141,7 @@ [email protected] | |||
141 | [email protected] | 141 | [email protected] |
142 | [email protected] | 142 | [email protected] |
143 | [email protected] "Event" | 143 | [email protected] "Event" |
144 | TYP[email protected] | 144 | GENERIC[email protected] |
145 | [email protected] "<" | 145 | [email protected] "<" |
146 | [email protected] | 146 | [email protected] |
147 | [email protected] | 147 | [email protected] |
diff --git a/crates/ra_syntax/test_data/parser/ok/0050_async_block_as_argument.rast b/crates/ra_syntax/test_data/parser/ok/0050_async_block_as_argument.rast index 798e81ca6..48e1f07d1 100644 --- a/crates/ra_syntax/test_data/parser/ok/0050_async_block_as_argument.rast +++ b/crates/ra_syntax/test_data/parser/ok/0050_async_block_as_argument.rast | |||
@@ -32,7 +32,7 @@ [email protected] | |||
32 | [email protected] | 32 | [email protected] |
33 | [email protected] | 33 | [email protected] |
34 | [email protected] "Future" | 34 | [email protected] "Future" |
35 | TYP[email protected] | 35 | GENERIC[email protected] |
36 | [email protected] "<" | 36 | [email protected] "<" |
37 | [email protected] | 37 | [email protected] |
38 | [email protected] | 38 | [email protected] |
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 2cc849784..706ccdc39 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 | |||
@@ -172,7 +172,7 @@ [email protected] | |||
172 | [email protected] | 172 | [email protected] |
173 | [email protected] | 173 | [email protected] |
174 | [email protected] "Foo" | 174 | [email protected] "Foo" |
175 | TYP[email protected] | 175 | GENERIC[email protected] |
176 | [email protected] "<" | 176 | [email protected] "<" |
177 | [email protected] | 177 | [email protected] |
178 | [email protected] "\'a" | 178 | [email protected] "\'a" |
@@ -490,7 +490,7 @@ [email protected] | |||
490 | [email protected] | 490 | [email protected] |
491 | [email protected] | 491 | [email protected] |
492 | [email protected] "Rc" | 492 | [email protected] "Rc" |
493 | TYP[email protected] | 493 | GENERIC[email protected] |
494 | [email protected] "<" | 494 | [email protected] "<" |
495 | [email protected] | 495 | [email protected] |
496 | [email protected] | 496 | [email protected] |
diff --git a/crates/ra_syntax/test_data/parser/ok/0052_for_range_block.rast b/crates/ra_syntax/test_data/parser/ok/0052_for_range_block.rast index a30000398..fd4f4f242 100644 --- a/crates/ra_syntax/test_data/parser/ok/0052_for_range_block.rast +++ b/crates/ra_syntax/test_data/parser/ok/0052_for_range_block.rast | |||
@@ -50,7 +50,7 @@ [email protected] | |||
50 | [email protected] "." | 50 | [email protected] "." |
51 | [email protected] | 51 | [email protected] |
52 | [email protected] "sum" | 52 | [email protected] "sum" |
53 | TYP[email protected] | 53 | GENERIC[email protected] |
54 | [email protected] "::" | 54 | [email protected] "::" |
55 | [email protected] "<" | 55 | [email protected] "<" |
56 | [email protected] | 56 | [email protected] |
diff --git a/crates/ra_syntax/test_data/parser/ok/0054_qual_path_in_type_arg.rast b/crates/ra_syntax/test_data/parser/ok/0054_qual_path_in_type_arg.rast index e3997ac5b..0d48c7e81 100644 --- a/crates/ra_syntax/test_data/parser/ok/0054_qual_path_in_type_arg.rast +++ b/crates/ra_syntax/test_data/parser/ok/0054_qual_path_in_type_arg.rast | |||
@@ -16,7 +16,7 @@ [email protected] | |||
16 | [email protected] | 16 | [email protected] |
17 | [email protected] | 17 | [email protected] |
18 | [email protected] "Foo" | 18 | [email protected] "Foo" |
19 | TYP[email protected] | 19 | GENERIC[email protected] |
20 | [email protected] "<" | 20 | [email protected] "<" |
21 | [email protected] | 21 | [email protected] |
22 | [email protected] | 22 | [email protected] |