diff options
author | Lukas Wirth <[email protected]> | 2021-01-15 17:57:32 +0000 |
---|---|---|
committer | Lukas Wirth <[email protected]> | 2021-01-15 18:21:23 +0000 |
commit | cb863390f23bc2eac6561d55def9bd3ba54605fc (patch) | |
tree | b19b39d9b6231e8857a4096cc803cf35e2ddbe81 /crates/syntax | |
parent | 0c58aa9dc0e24f0fa6a6ee7eb0c35041dedddb0a (diff) |
Handle self/super/crate in PathSegment as NameRef
Diffstat (limited to 'crates/syntax')
21 files changed, 87 insertions, 41 deletions
diff --git a/crates/syntax/src/algo.rs b/crates/syntax/src/algo.rs index 384d031e7..39da45cc0 100644 --- a/crates/syntax/src/algo.rs +++ b/crates/syntax/src/algo.rs | |||
@@ -883,7 +883,7 @@ use crate::AstNode; | |||
883 | 883 | ||
884 | replacements: | 884 | replacements: |
885 | 885 | ||
886 | Line 2: Node(NAME_REF@5..14) -> crate | 886 | Line 2: Token(IDENT@5..14 "text_edit") -> crate |
887 | Line 2: Token([email protected] "TextEdit") -> AstNode | 887 | Line 2: Token([email protected] "TextEdit") -> AstNode |
888 | Line 2: Token([email protected] "\n\n") -> "\n" | 888 | Line 2: Token([email protected] "\n\n") -> "\n" |
889 | 889 | ||
diff --git a/crates/syntax/src/ast/generated/nodes.rs b/crates/syntax/src/ast/generated/nodes.rs index 9c96d3d07..1d722db3c 100644 --- a/crates/syntax/src/ast/generated/nodes.rs +++ b/crates/syntax/src/ast/generated/nodes.rs | |||
@@ -18,6 +18,9 @@ pub struct NameRef { | |||
18 | } | 18 | } |
19 | impl NameRef { | 19 | impl NameRef { |
20 | pub fn ident_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![ident]) } | 20 | pub fn ident_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![ident]) } |
21 | pub fn self_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![self]) } | ||
22 | pub fn super_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![super]) } | ||
23 | pub fn crate_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![crate]) } | ||
21 | } | 24 | } |
22 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] | 25 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] |
23 | pub struct Lifetime { | 26 | pub struct Lifetime { |
@@ -42,9 +45,6 @@ pub struct PathSegment { | |||
42 | pub(crate) syntax: SyntaxNode, | 45 | pub(crate) syntax: SyntaxNode, |
43 | } | 46 | } |
44 | impl PathSegment { | 47 | impl PathSegment { |
45 | pub fn crate_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![crate]) } | ||
46 | pub fn self_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![self]) } | ||
47 | pub fn super_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![super]) } | ||
48 | pub fn coloncolon_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![::]) } | 48 | pub fn coloncolon_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![::]) } |
49 | pub fn name_ref(&self) -> Option<NameRef> { support::child(&self.syntax) } | 49 | pub fn name_ref(&self) -> Option<NameRef> { support::child(&self.syntax) } |
50 | pub fn generic_arg_list(&self) -> Option<GenericArgList> { support::child(&self.syntax) } | 50 | pub fn generic_arg_list(&self) -> Option<GenericArgList> { support::child(&self.syntax) } |
diff --git a/crates/syntax/src/ast/node_ext.rs b/crates/syntax/src/ast/node_ext.rs index 27381ba80..b8ce71d27 100644 --- a/crates/syntax/src/ast/node_ext.rs +++ b/crates/syntax/src/ast/node_ext.rs | |||
@@ -156,14 +156,28 @@ impl ast::PathSegment { | |||
156 | .expect("segments are always nested in paths") | 156 | .expect("segments are always nested in paths") |
157 | } | 157 | } |
158 | 158 | ||
159 | pub fn crate_token(&self) -> Option<SyntaxToken> { | ||
160 | self.name_ref().and_then(|it| it.crate_token()) | ||
161 | } | ||
162 | |||
163 | pub fn self_token(&self) -> Option<SyntaxToken> { | ||
164 | self.name_ref().and_then(|it| it.self_token()) | ||
165 | } | ||
166 | |||
167 | pub fn super_token(&self) -> Option<SyntaxToken> { | ||
168 | self.name_ref().and_then(|it| it.super_token()) | ||
169 | } | ||
170 | |||
159 | pub fn kind(&self) -> Option<PathSegmentKind> { | 171 | pub fn kind(&self) -> Option<PathSegmentKind> { |
160 | let res = if let Some(name_ref) = self.name_ref() { | 172 | let res = if let Some(name_ref) = self.name_ref() { |
161 | PathSegmentKind::Name(name_ref) | 173 | match name_ref.syntax().first_token().map(|it| it.kind()) { |
174 | Some(T![self]) => PathSegmentKind::SelfKw, | ||
175 | Some(T![super]) => PathSegmentKind::SuperKw, | ||
176 | Some(T![crate]) => PathSegmentKind::CrateKw, | ||
177 | _ => PathSegmentKind::Name(name_ref), | ||
178 | } | ||
162 | } else { | 179 | } else { |
163 | match self.syntax().first_child_or_token()?.kind() { | 180 | match self.syntax().first_child_or_token()?.kind() { |
164 | T![self] => PathSegmentKind::SelfKw, | ||
165 | T![super] => PathSegmentKind::SuperKw, | ||
166 | T![crate] => PathSegmentKind::CrateKw, | ||
167 | T![<] => { | 181 | T![<] => { |
168 | // <T> or <T as Trait> | 182 | // <T> or <T as Trait> |
169 | // T is any TypeRef, Trait has to be a PathType | 183 | // T is any TypeRef, Trait has to be a PathType |
diff --git a/crates/syntax/src/validation.rs b/crates/syntax/src/validation.rs index bfa2dc4ba..7901580ee 100644 --- a/crates/syntax/src/validation.rs +++ b/crates/syntax/src/validation.rs | |||
@@ -256,7 +256,7 @@ fn validate_path_keywords(segment: ast::PathSegment, errors: &mut Vec<SyntaxErro | |||
256 | )); | 256 | )); |
257 | } | 257 | } |
258 | } else if let Some(token) = segment.super_token() { | 258 | } else if let Some(token) = segment.super_token() { |
259 | if !all_supers(&path) { | 259 | if segment.coloncolon_token().is_some() || !all_supers(&path) { |
260 | errors.push(SyntaxError::new( | 260 | errors.push(SyntaxError::new( |
261 | "The `super` keyword may only be preceded by other `super`s", | 261 | "The `super` keyword may only be preceded by other `super`s", |
262 | token.text_range(), | 262 | token.text_range(), |
diff --git a/crates/syntax/test_data/parser/err/0018_incomplete_fn.rast b/crates/syntax/test_data/parser/err/0018_incomplete_fn.rast index 72939fc98..060f47dc4 100644 --- a/crates/syntax/test_data/parser/err/0018_incomplete_fn.rast +++ b/crates/syntax/test_data/parser/err/0018_incomplete_fn.rast | |||
@@ -49,7 +49,8 @@ [email protected] | |||
49 | [email protected] | 49 | [email protected] |
50 | [email protected] | 50 | [email protected] |
51 | [email protected] | 51 | [email protected] |
52 | [email protected] "self" | 52 | [email protected] |
53 | [email protected] "self" | ||
53 | [email protected] "." | 54 | [email protected] "." |
54 | [email protected] | 55 | [email protected] |
55 | [email protected] "scopes" | 56 | [email protected] "scopes" |
@@ -66,7 +67,8 @@ [email protected] | |||
66 | [email protected] | 67 | [email protected] |
67 | [email protected] | 68 | [email protected] |
68 | [email protected] | 69 | [email protected] |
69 | [email protected] "self" | 70 | [email protected] |
71 | [email protected] "self" | ||
70 | [email protected] "." | 72 | [email protected] "." |
71 | [email protected] | 73 | [email protected] |
72 | [email protected] "scopes" | 74 | [email protected] "scopes" |
diff --git a/crates/syntax/test_data/parser/err/0035_use_recover.rast b/crates/syntax/test_data/parser/err/0035_use_recover.rast index 2f03709eb..a95151bc5 100644 --- a/crates/syntax/test_data/parser/err/0035_use_recover.rast +++ b/crates/syntax/test_data/parser/err/0035_use_recover.rast | |||
@@ -24,7 +24,8 @@ [email protected] | |||
24 | [email protected] | 24 | [email protected] |
25 | [email protected] | 25 | [email protected] |
26 | [email protected] | 26 | [email protected] |
27 | [email protected] "crate" | 27 | [email protected] |
28 | [email protected] "crate" | ||
28 | [email protected] "::" | 29 | [email protected] "::" |
29 | [email protected] | 30 | [email protected] |
30 | [email protected] | 31 | [email protected] |
diff --git a/crates/syntax/test_data/parser/err/0040_illegal_crate_kw_location.rast b/crates/syntax/test_data/parser/err/0040_illegal_crate_kw_location.rast index 284c8715b..7449b5ddf 100644 --- a/crates/syntax/test_data/parser/err/0040_illegal_crate_kw_location.rast +++ b/crates/syntax/test_data/parser/err/0040_illegal_crate_kw_location.rast | |||
@@ -6,7 +6,8 @@ [email protected] | |||
6 | [email protected] | 6 | [email protected] |
7 | [email protected] | 7 | [email protected] |
8 | [email protected] "::" | 8 | [email protected] "::" |
9 | [email protected] "crate" | 9 | [email protected] |
10 | [email protected] "crate" | ||
10 | [email protected] ";" | 11 | [email protected] ";" |
11 | [email protected] "\n" | 12 | [email protected] "\n" |
12 | [email protected] | 13 | [email protected] |
@@ -18,7 +19,8 @@ [email protected] | |||
18 | [email protected] | 19 | [email protected] |
19 | [email protected] | 20 | [email protected] |
20 | [email protected] | 21 | [email protected] |
21 | [email protected] "crate" | 22 | [email protected] |
23 | [email protected] "crate" | ||
22 | [email protected] "," | 24 | [email protected] "," |
23 | [email protected] " " | 25 | [email protected] " " |
24 | [email protected] | 26 | [email protected] |
@@ -35,7 +37,8 @@ [email protected] | |||
35 | [email protected] | 37 | [email protected] |
36 | [email protected] | 38 | [email protected] |
37 | [email protected] | 39 | [email protected] |
38 | [email protected] "crate" | 40 | [email protected] |
41 | [email protected] "crate" | ||
39 | [email protected] "::" | 42 | [email protected] "::" |
40 | [email protected] | 43 | [email protected] |
41 | [email protected] | 44 | [email protected] |
@@ -63,7 +66,8 @@ [email protected] | |||
63 | [email protected] "hello" | 66 | [email protected] "hello" |
64 | [email protected] "::" | 67 | [email protected] "::" |
65 | [email protected] | 68 | [email protected] |
66 | [email protected] "crate" | 69 | [email protected] |
70 | [email protected] "crate" | ||
67 | [email protected] ";" | 71 | [email protected] ";" |
68 | [email protected] "\n" | 72 | [email protected] "\n" |
69 | [email protected] | 73 | [email protected] |
@@ -78,7 +82,8 @@ [email protected] | |||
78 | [email protected] "hello" | 82 | [email protected] "hello" |
79 | [email protected] "::" | 83 | [email protected] "::" |
80 | [email protected] | 84 | [email protected] |
81 | [email protected] "crate" | 85 | [email protected] |
86 | [email protected] "crate" | ||
82 | [email protected] "::" | 87 | [email protected] "::" |
83 | [email protected] | 88 | [email protected] |
84 | [email protected] | 89 | [email protected] |
diff --git a/crates/syntax/test_data/parser/err/0041_illegal_super_keyword_location.rast b/crates/syntax/test_data/parser/err/0041_illegal_super_keyword_location.rast index 2049a9d72..271f8d780 100644 --- a/crates/syntax/test_data/parser/err/0041_illegal_super_keyword_location.rast +++ b/crates/syntax/test_data/parser/err/0041_illegal_super_keyword_location.rast | |||
@@ -6,7 +6,8 @@ [email protected] | |||
6 | [email protected] | 6 | [email protected] |
7 | [email protected] | 7 | [email protected] |
8 | [email protected] "::" | 8 | [email protected] "::" |
9 | [email protected] "super" | 9 | [email protected] |
10 | [email protected] "super" | ||
10 | [email protected] ";" | 11 | [email protected] ";" |
11 | [email protected] "\n" | 12 | [email protected] "\n" |
12 | [email protected] | 13 | [email protected] |
@@ -20,7 +21,8 @@ [email protected] | |||
20 | [email protected] "a" | 21 | [email protected] "a" |
21 | [email protected] "::" | 22 | [email protected] "::" |
22 | [email protected] | 23 | [email protected] |
23 | [email protected] "super" | 24 | [email protected] |
25 | [email protected] "super" | ||
24 | [email protected] ";" | 26 | [email protected] ";" |
25 | [email protected] "\n" | 27 | [email protected] "\n" |
26 | [email protected] | 28 | [email protected] |
@@ -31,14 +33,16 @@ [email protected] | |||
31 | [email protected] | 33 | [email protected] |
32 | [email protected] | 34 | [email protected] |
33 | [email protected] | 35 | [email protected] |
34 | [email protected] "super" | 36 | [email protected] |
37 | [email protected] "super" | ||
35 | [email protected] "::" | 38 | [email protected] "::" |
36 | [email protected] | 39 | [email protected] |
37 | [email protected] | 40 | [email protected] |
38 | [email protected] "a" | 41 | [email protected] "a" |
39 | [email protected] "::" | 42 | [email protected] "::" |
40 | [email protected] | 43 | [email protected] |
41 | [email protected] "super" | 44 | [email protected] |
45 | [email protected] "super" | ||
42 | [email protected] ";" | 46 | [email protected] ";" |
43 | [email protected] "\n" | 47 | [email protected] "\n" |
44 | [email protected] | 48 | [email protected] |
@@ -56,7 +60,8 @@ [email protected] | |||
56 | [email protected] | 60 | [email protected] |
57 | [email protected] | 61 | [email protected] |
58 | [email protected] | 62 | [email protected] |
59 | [email protected] "super" | 63 | [email protected] |
64 | [email protected] "super" | ||
60 | [email protected] "::" | 65 | [email protected] "::" |
61 | [email protected] | 66 | [email protected] |
62 | [email protected] | 67 | [email protected] |
diff --git a/crates/syntax/test_data/parser/err/0042_illegal_self_keyword_location.rast b/crates/syntax/test_data/parser/err/0042_illegal_self_keyword_location.rast index deadf56b4..01f601091 100644 --- a/crates/syntax/test_data/parser/err/0042_illegal_self_keyword_location.rast +++ b/crates/syntax/test_data/parser/err/0042_illegal_self_keyword_location.rast | |||
@@ -6,7 +6,8 @@ [email protected] | |||
6 | [email protected] | 6 | [email protected] |
7 | [email protected] | 7 | [email protected] |
8 | [email protected] "::" | 8 | [email protected] "::" |
9 | [email protected] "self" | 9 | [email protected] |
10 | [email protected] "self" | ||
10 | [email protected] ";" | 11 | [email protected] ";" |
11 | [email protected] "\n" | 12 | [email protected] "\n" |
12 | [email protected] | 13 | [email protected] |
@@ -20,7 +21,8 @@ [email protected] | |||
20 | [email protected] "a" | 21 | [email protected] "a" |
21 | [email protected] "::" | 22 | [email protected] "::" |
22 | [email protected] | 23 | [email protected] |
23 | [email protected] "self" | 24 | [email protected] |
25 | [email protected] "self" | ||
24 | [email protected] ";" | 26 | [email protected] ";" |
25 | [email protected] "\n" | 27 | [email protected] "\n" |
26 | error 6..10: The `self` keyword is only allowed as the first segment of a path | 28 | error 6..10: The `self` keyword is only allowed as the first segment of a path |
diff --git a/crates/syntax/test_data/parser/inline/err/0015_empty_segment.rast b/crates/syntax/test_data/parser/inline/err/0015_empty_segment.rast index e872526d9..d3c5dde58 100644 --- a/crates/syntax/test_data/parser/inline/err/0015_empty_segment.rast +++ b/crates/syntax/test_data/parser/inline/err/0015_empty_segment.rast | |||
@@ -6,7 +6,8 @@ [email protected] | |||
6 | [email protected] | 6 | [email protected] |
7 | [email protected] | 7 | [email protected] |
8 | [email protected] | 8 | [email protected] |
9 | [email protected] "crate" | 9 | [email protected] |
10 | [email protected] "crate" | ||
10 | [email protected] "::" | 11 | [email protected] "::" |
11 | [email protected] ";" | 12 | [email protected] ";" |
12 | [email protected] "\n" | 13 | [email protected] "\n" |
diff --git a/crates/syntax/test_data/parser/inline/ok/0002_use_tree_list.rast b/crates/syntax/test_data/parser/inline/ok/0002_use_tree_list.rast index f40500e38..970826739 100644 --- a/crates/syntax/test_data/parser/inline/ok/0002_use_tree_list.rast +++ b/crates/syntax/test_data/parser/inline/ok/0002_use_tree_list.rast | |||
@@ -11,7 +11,8 @@ [email protected] | |||
11 | [email protected] | 11 | [email protected] |
12 | [email protected] | 12 | [email protected] |
13 | [email protected] | 13 | [email protected] |
14 | [email protected] "crate" | 14 | [email protected] |
15 | [email protected] "crate" | ||
15 | [email protected] "::" | 16 | [email protected] "::" |
16 | [email protected] | 17 | [email protected] |
17 | [email protected] | 18 | [email protected] |
diff --git a/crates/syntax/test_data/parser/inline/ok/0052_path_type.rast b/crates/syntax/test_data/parser/inline/ok/0052_path_type.rast index 9bc36bea7..46a103d5b 100644 --- a/crates/syntax/test_data/parser/inline/ok/0052_path_type.rast +++ b/crates/syntax/test_data/parser/inline/ok/0052_path_type.rast | |||
@@ -42,7 +42,8 @@ [email protected] | |||
42 | [email protected] | 42 | [email protected] |
43 | [email protected] | 43 | [email protected] |
44 | [email protected] | 44 | [email protected] |
45 | [email protected] "self" | 45 | [email protected] |
46 | [email protected] "self" | ||
46 | [email protected] "::" | 47 | [email protected] "::" |
47 | [email protected] | 48 | [email protected] |
48 | [email protected] | 49 | [email protected] |
@@ -61,7 +62,8 @@ [email protected] | |||
61 | [email protected] | 62 | [email protected] |
62 | [email protected] | 63 | [email protected] |
63 | [email protected] | 64 | [email protected] |
64 | [email protected] "super" | 65 | [email protected] |
66 | [email protected] "super" | ||
65 | [email protected] "::" | 67 | [email protected] "::" |
66 | [email protected] | 68 | [email protected] |
67 | [email protected] | 69 | [email protected] |
diff --git a/crates/syntax/test_data/parser/inline/ok/0062_mod_contents.rast b/crates/syntax/test_data/parser/inline/ok/0062_mod_contents.rast index e4fb32de1..583dcac7e 100644 --- a/crates/syntax/test_data/parser/inline/ok/0062_mod_contents.rast +++ b/crates/syntax/test_data/parser/inline/ok/0062_mod_contents.rast | |||
@@ -43,7 +43,8 @@ [email protected] | |||
43 | [email protected] | 43 | [email protected] |
44 | [email protected] | 44 | [email protected] |
45 | [email protected] | 45 | [email protected] |
46 | [email protected] "super" | 46 | [email protected] |
47 | [email protected] "super" | ||
47 | [email protected] "::" | 48 | [email protected] "::" |
48 | [email protected] | 49 | [email protected] |
49 | [email protected] | 50 | [email protected] |
diff --git a/crates/syntax/test_data/parser/inline/ok/0067_crate_path.rast b/crates/syntax/test_data/parser/inline/ok/0067_crate_path.rast index 702f2e0b0..87c0c48dc 100644 --- a/crates/syntax/test_data/parser/inline/ok/0067_crate_path.rast +++ b/crates/syntax/test_data/parser/inline/ok/0067_crate_path.rast | |||
@@ -6,7 +6,8 @@ [email protected] | |||
6 | [email protected] | 6 | [email protected] |
7 | [email protected] | 7 | [email protected] |
8 | [email protected] | 8 | [email protected] |
9 | [email protected] "crate" | 9 | [email protected] |
10 | [email protected] "crate" | ||
10 | [email protected] "::" | 11 | [email protected] "::" |
11 | [email protected] | 12 | [email protected] |
12 | [email protected] | 13 | [email protected] |
diff --git a/crates/syntax/test_data/parser/inline/ok/0069_use_tree_list_after_path.rast b/crates/syntax/test_data/parser/inline/ok/0069_use_tree_list_after_path.rast index c4c5bc51e..192a9cca6 100644 --- a/crates/syntax/test_data/parser/inline/ok/0069_use_tree_list_after_path.rast +++ b/crates/syntax/test_data/parser/inline/ok/0069_use_tree_list_after_path.rast | |||
@@ -5,7 +5,8 @@ [email protected] | |||
5 | [email protected] | 5 | [email protected] |
6 | [email protected] | 6 | [email protected] |
7 | [email protected] | 7 | [email protected] |
8 | [email protected] "crate" | 8 | [email protected] |
9 | [email protected] "crate" | ||
9 | [email protected] "::" | 10 | [email protected] "::" |
10 | [email protected] | 11 | [email protected] |
11 | [email protected] "{" | 12 | [email protected] "{" |
@@ -23,7 +24,8 @@ [email protected] | |||
23 | [email protected] | 24 | [email protected] |
24 | [email protected] | 25 | [email protected] |
25 | [email protected] | 26 | [email protected] |
26 | [email protected] "self" | 27 | [email protected] |
28 | [email protected] "self" | ||
27 | [email protected] "::" | 29 | [email protected] "::" |
28 | [email protected] | 30 | [email protected] |
29 | [email protected] "{" | 31 | [email protected] "{" |
diff --git a/crates/syntax/test_data/parser/inline/ok/0117_macro_call_type.rast b/crates/syntax/test_data/parser/inline/ok/0117_macro_call_type.rast index f3d4ad72c..3016a6574 100644 --- a/crates/syntax/test_data/parser/inline/ok/0117_macro_call_type.rast +++ b/crates/syntax/test_data/parser/inline/ok/0117_macro_call_type.rast | |||
@@ -30,7 +30,8 @@ [email protected] | |||
30 | [email protected] | 30 | [email protected] |
31 | [email protected] | 31 | [email protected] |
32 | [email protected] | 32 | [email protected] |
33 | [email protected] "crate" | 33 | [email protected] |
34 | [email protected] "crate" | ||
34 | [email protected] "::" | 35 | [email protected] "::" |
35 | [email protected] | 36 | [email protected] |
36 | [email protected] | 37 | [email protected] |
diff --git a/crates/syntax/test_data/parser/inline/ok/0125_crate_keyword_path.rast b/crates/syntax/test_data/parser/inline/ok/0125_crate_keyword_path.rast index aa4d7a784..0fed2d311 100644 --- a/crates/syntax/test_data/parser/inline/ok/0125_crate_keyword_path.rast +++ b/crates/syntax/test_data/parser/inline/ok/0125_crate_keyword_path.rast | |||
@@ -17,7 +17,8 @@ [email protected] | |||
17 | [email protected] | 17 | [email protected] |
18 | [email protected] | 18 | [email protected] |
19 | [email protected] | 19 | [email protected] |
20 | [email protected] "crate" | 20 | [email protected] |
21 | [email protected] "crate" | ||
21 | [email protected] "::" | 22 | [email protected] "::" |
22 | [email protected] | 23 | [email protected] |
23 | [email protected] | 24 | [email protected] |
diff --git a/crates/syntax/test_data/parser/inline/ok/0153_pub_parens_typepath.rast b/crates/syntax/test_data/parser/inline/ok/0153_pub_parens_typepath.rast index c204f0e2d..a5ee07499 100644 --- a/crates/syntax/test_data/parser/inline/ok/0153_pub_parens_typepath.rast +++ b/crates/syntax/test_data/parser/inline/ok/0153_pub_parens_typepath.rast | |||
@@ -16,7 +16,8 @@ [email protected] | |||
16 | [email protected] | 16 | [email protected] |
17 | [email protected] | 17 | [email protected] |
18 | [email protected] | 18 | [email protected] |
19 | [email protected] "super" | 19 | [email protected] |
20 | [email protected] "super" | ||
20 | [email protected] "::" | 21 | [email protected] "::" |
21 | [email protected] | 22 | [email protected] |
22 | [email protected] | 23 | [email protected] |
@@ -42,7 +43,8 @@ [email protected] | |||
42 | [email protected] | 43 | [email protected] |
43 | [email protected] | 44 | [email protected] |
44 | [email protected] | 45 | [email protected] |
45 | [email protected] "crate" | 46 | [email protected] |
47 | [email protected] "crate" | ||
46 | [email protected] "::" | 48 | [email protected] "::" |
47 | [email protected] | 49 | [email protected] |
48 | [email protected] | 50 | [email protected] |
diff --git a/crates/syntax/test_data/parser/ok/0013_use_path_self_super.rast b/crates/syntax/test_data/parser/ok/0013_use_path_self_super.rast index 66ab13660..dba74e222 100644 --- a/crates/syntax/test_data/parser/ok/0013_use_path_self_super.rast +++ b/crates/syntax/test_data/parser/ok/0013_use_path_self_super.rast | |||
@@ -6,7 +6,8 @@ [email protected] | |||
6 | [email protected] | 6 | [email protected] |
7 | [email protected] | 7 | [email protected] |
8 | [email protected] | 8 | [email protected] |
9 | [email protected] "self" | 9 | [email protected] |
10 | [email protected] "self" | ||
10 | [email protected] "::" | 11 | [email protected] "::" |
11 | [email protected] | 12 | [email protected] |
12 | [email protected] | 13 | [email protected] |
@@ -21,10 +22,12 @@ [email protected] | |||
21 | [email protected] | 22 | [email protected] |
22 | [email protected] | 23 | [email protected] |
23 | [email protected] | 24 | [email protected] |
24 | [email protected] "super" | 25 | [email protected] |
26 | [email protected] "super" | ||
25 | [email protected] "::" | 27 | [email protected] "::" |
26 | [email protected] | 28 | [email protected] |
27 | [email protected] "super" | 29 | [email protected] |
30 | [email protected] "super" | ||
28 | [email protected] "::" | 31 | [email protected] "::" |
29 | [email protected] | 32 | [email protected] |
30 | [email protected] | 33 | [email protected] |
diff --git a/crates/syntax/test_data/parser/ok/0020_type_param_bounds.rast b/crates/syntax/test_data/parser/ok/0020_type_param_bounds.rast index 0612a71de..21c564a20 100644 --- a/crates/syntax/test_data/parser/ok/0020_type_param_bounds.rast +++ b/crates/syntax/test_data/parser/ok/0020_type_param_bounds.rast | |||
@@ -187,7 +187,8 @@ [email protected] | |||
187 | [email protected] | 187 | [email protected] |
188 | [email protected] | 188 | [email protected] |
189 | [email protected] | 189 | [email protected] |
190 | [email protected] "self" | 190 | [email protected] |
191 | [email protected] "self" | ||
191 | [email protected] "::" | 192 | [email protected] "::" |
192 | [email protected] | 193 | [email protected] |
193 | [email protected] | 194 | [email protected] |
diff --git a/crates/syntax/test_data/parser/ok/0034_crate_path_in_call.rast b/crates/syntax/test_data/parser/ok/0034_crate_path_in_call.rast index 5ad8c570d..a0a5ca7f5 100644 --- a/crates/syntax/test_data/parser/ok/0034_crate_path_in_call.rast +++ b/crates/syntax/test_data/parser/ok/0034_crate_path_in_call.rast | |||
@@ -25,7 +25,8 @@ [email protected] | |||
25 | [email protected] | 25 | [email protected] |
26 | [email protected] | 26 | [email protected] |
27 | [email protected] | 27 | [email protected] |
28 | [email protected] "crate" | 28 | [email protected] |
29 | [email protected] "crate" | ||
29 | [email protected] "::" | 30 | [email protected] "::" |
30 | [email protected] | 31 | [email protected] |
31 | [email protected] | 32 | [email protected] |