diff options
author | Lukas Wirth <lukastw97@gmail.com> | 2021-01-15 20:07:38 +0000 |
---|---|---|
committer | Lukas Wirth <lukastw97@gmail.com> | 2021-01-15 21:18:43 +0000 |
commit | 98718e0544f42e55642d2838b00d6a7bef1e2414 (patch) | |
tree | 15d727f30f9dc3338203f8f70f19f8023133f382 /crates/syntax/test_data/parser/inline/ok | |
parent | 8a869e870ac6328967fb120a0ebe44a9c900eaf0 (diff) |
Wrap remaining self/super/crate in Name{Ref}
Diffstat (limited to 'crates/syntax/test_data/parser/inline/ok')
8 files changed, 86 insertions, 38 deletions
diff --git a/crates/syntax/test_data/parser/inline/ok/0006_self_param.rast b/crates/syntax/test_data/parser/inline/ok/0006_self_param.rast index 8048f5fad..f0d152d33 100644 --- a/crates/syntax/test_data/parser/inline/ok/0006_self_param.rast +++ b/crates/syntax/test_data/parser/inline/ok/0006_self_param.rast | |||
@@ -19,7 +19,8 @@ SOURCE_FILE@0..128 | |||
19 | PARAM_LIST@17..23 | 19 | PARAM_LIST@17..23 |
20 | L_PAREN@17..18 "(" | 20 | L_PAREN@17..18 "(" |
21 | SELF_PARAM@18..22 | 21 | SELF_PARAM@18..22 |
22 | SELF_KW@18..22 "self" | 22 | NAME@18..22 |
23 | SELF_KW@18..22 "self" | ||
23 | R_PAREN@22..23 ")" | 24 | R_PAREN@22..23 ")" |
24 | WHITESPACE@23..24 " " | 25 | WHITESPACE@23..24 " " |
25 | BLOCK_EXPR@24..26 | 26 | BLOCK_EXPR@24..26 |
@@ -35,7 +36,8 @@ SOURCE_FILE@0..128 | |||
35 | L_PAREN@35..36 "(" | 36 | L_PAREN@35..36 "(" |
36 | SELF_PARAM@36..41 | 37 | SELF_PARAM@36..41 |
37 | AMP@36..37 "&" | 38 | AMP@36..37 "&" |
38 | SELF_KW@37..41 "self" | 39 | NAME@37..41 |
40 | SELF_KW@37..41 "self" | ||
39 | COMMA@41..42 "," | 41 | COMMA@41..42 "," |
40 | R_PAREN@42..43 ")" | 42 | R_PAREN@42..43 ")" |
41 | WHITESPACE@43..44 " " | 43 | WHITESPACE@43..44 " " |
@@ -55,7 +57,8 @@ SOURCE_FILE@0..128 | |||
55 | LIFETIME@57..59 | 57 | LIFETIME@57..59 |
56 | LIFETIME_IDENT@57..59 "\'a" | 58 | LIFETIME_IDENT@57..59 "\'a" |
57 | WHITESPACE@59..60 " " | 59 | WHITESPACE@59..60 " " |
58 | SELF_KW@60..64 "self" | 60 | NAME@60..64 |
61 | SELF_KW@60..64 "self" | ||
59 | COMMA@64..65 "," | 62 | COMMA@64..65 "," |
60 | R_PAREN@65..66 ")" | 63 | R_PAREN@65..66 ")" |
61 | WHITESPACE@66..67 " " | 64 | WHITESPACE@66..67 " " |
@@ -77,7 +80,8 @@ SOURCE_FILE@0..128 | |||
77 | WHITESPACE@82..83 " " | 80 | WHITESPACE@82..83 " " |
78 | MUT_KW@83..86 "mut" | 81 | MUT_KW@83..86 "mut" |
79 | WHITESPACE@86..87 " " | 82 | WHITESPACE@86..87 " " |
80 | SELF_KW@87..91 "self" | 83 | NAME@87..91 |
84 | SELF_KW@87..91 "self" | ||
81 | COMMA@91..92 "," | 85 | COMMA@91..92 "," |
82 | WHITESPACE@92..93 " " | 86 | WHITESPACE@92..93 " " |
83 | PARAM@93..99 | 87 | PARAM@93..99 |
@@ -107,7 +111,8 @@ SOURCE_FILE@0..128 | |||
107 | SELF_PARAM@113..121 | 111 | SELF_PARAM@113..121 |
108 | MUT_KW@113..116 "mut" | 112 | MUT_KW@113..116 "mut" |
109 | WHITESPACE@116..117 " " | 113 | WHITESPACE@116..117 " " |
110 | SELF_KW@117..121 "self" | 114 | NAME@117..121 |
115 | SELF_KW@117..121 "self" | ||
111 | R_PAREN@121..122 ")" | 116 | R_PAREN@121..122 ")" |
112 | WHITESPACE@122..123 " " | 117 | WHITESPACE@122..123 " " |
113 | BLOCK_EXPR@123..125 | 118 | BLOCK_EXPR@123..125 |
diff --git a/crates/syntax/test_data/parser/inline/ok/0018_arb_self_types.rast b/crates/syntax/test_data/parser/inline/ok/0018_arb_self_types.rast index ddbd66588..df59f37a2 100644 --- a/crates/syntax/test_data/parser/inline/ok/0018_arb_self_types.rast +++ b/crates/syntax/test_data/parser/inline/ok/0018_arb_self_types.rast | |||
@@ -19,7 +19,8 @@ SOURCE_FILE@0..69 | |||
19 | PARAM_LIST@17..30 | 19 | PARAM_LIST@17..30 |
20 | L_PAREN@17..18 "(" | 20 | L_PAREN@17..18 "(" |
21 | SELF_PARAM@18..29 | 21 | SELF_PARAM@18..29 |
22 | SELF_KW@18..22 "self" | 22 | NAME@18..22 |
23 | SELF_KW@18..22 "self" | ||
23 | COLON@22..23 ":" | 24 | COLON@22..23 ":" |
24 | WHITESPACE@23..24 " " | 25 | WHITESPACE@23..24 " " |
25 | REF_TYPE@24..29 | 26 | REF_TYPE@24..29 |
@@ -45,7 +46,8 @@ SOURCE_FILE@0..69 | |||
45 | SELF_PARAM@43..62 | 46 | SELF_PARAM@43..62 |
46 | MUT_KW@43..46 "mut" | 47 | MUT_KW@43..46 "mut" |
47 | WHITESPACE@46..47 " " | 48 | WHITESPACE@46..47 " " |
48 | SELF_KW@47..51 "self" | 49 | NAME@47..51 |
50 | SELF_KW@47..51 "self" | ||
49 | COLON@51..52 ":" | 51 | COLON@51..52 ":" |
50 | WHITESPACE@52..53 " " | 52 | WHITESPACE@52..53 " " |
51 | PATH_TYPE@53..62 | 53 | PATH_TYPE@53..62 |
diff --git a/crates/syntax/test_data/parser/inline/ok/0021_impl_item_list.rast b/crates/syntax/test_data/parser/inline/ok/0021_impl_item_list.rast index ca0702aba..dc7f6295b 100644 --- a/crates/syntax/test_data/parser/inline/ok/0021_impl_item_list.rast +++ b/crates/syntax/test_data/parser/inline/ok/0021_impl_item_list.rast | |||
@@ -67,7 +67,8 @@ SOURCE_FILE@0..89 | |||
67 | L_PAREN@76..77 "(" | 67 | L_PAREN@76..77 "(" |
68 | SELF_PARAM@77..82 | 68 | SELF_PARAM@77..82 |
69 | AMP@77..78 "&" | 69 | AMP@77..78 "&" |
70 | SELF_KW@78..82 "self" | 70 | NAME@78..82 |
71 | SELF_KW@78..82 "self" | ||
71 | R_PAREN@82..83 ")" | 72 | R_PAREN@82..83 ")" |
72 | WHITESPACE@83..84 " " | 73 | WHITESPACE@83..84 " " |
73 | BLOCK_EXPR@84..86 | 74 | BLOCK_EXPR@84..86 |
diff --git a/crates/syntax/test_data/parser/inline/ok/0022_crate_visibility.rast b/crates/syntax/test_data/parser/inline/ok/0022_crate_visibility.rast index 50742cbcf..f2ead8a62 100644 --- a/crates/syntax/test_data/parser/inline/ok/0022_crate_visibility.rast +++ b/crates/syntax/test_data/parser/inline/ok/0022_crate_visibility.rast | |||
@@ -1,9 +1,12 @@ | |||
1 | SOURCE_FILE@0..81 | 1 | SOURCE_FILE@0..62 |
2 | STRUCT@0..20 | 2 | STRUCT@0..20 |
3 | VISIBILITY@0..10 | 3 | VISIBILITY@0..10 |
4 | PUB_KW@0..3 "pub" | 4 | PUB_KW@0..3 "pub" |
5 | L_PAREN@3..4 "(" | 5 | L_PAREN@3..4 "(" |
6 | CRATE_KW@4..9 "crate" | 6 | PATH@4..9 |
7 | PATH_SEGMENT@4..9 | ||
8 | NAME_REF@4..9 | ||
9 | CRATE_KW@4..9 "crate" | ||
7 | R_PAREN@9..10 ")" | 10 | R_PAREN@9..10 ")" |
8 | WHITESPACE@10..11 " " | 11 | WHITESPACE@10..11 " " |
9 | STRUCT_KW@11..17 "struct" | 12 | STRUCT_KW@11..17 "struct" |
@@ -16,7 +19,10 @@ SOURCE_FILE@0..81 | |||
16 | VISIBILITY@21..30 | 19 | VISIBILITY@21..30 |
17 | PUB_KW@21..24 "pub" | 20 | PUB_KW@21..24 "pub" |
18 | L_PAREN@24..25 "(" | 21 | L_PAREN@24..25 "(" |
19 | SELF_KW@25..29 "self" | 22 | PATH@25..29 |
23 | PATH_SEGMENT@25..29 | ||
24 | NAME_REF@25..29 | ||
25 | SELF_KW@25..29 "self" | ||
20 | R_PAREN@29..30 ")" | 26 | R_PAREN@29..30 ")" |
21 | WHITESPACE@30..31 " " | 27 | WHITESPACE@30..31 " " |
22 | STRUCT_KW@31..37 "struct" | 28 | STRUCT_KW@31..37 "struct" |
@@ -25,29 +31,19 @@ SOURCE_FILE@0..81 | |||
25 | IDENT@38..39 "S" | 31 | IDENT@38..39 "S" |
26 | SEMICOLON@39..40 ";" | 32 | SEMICOLON@39..40 ";" |
27 | WHITESPACE@40..41 "\n" | 33 | WHITESPACE@40..41 "\n" |
28 | STRUCT@41..60 | 34 | STRUCT@41..61 |
29 | VISIBILITY@41..50 | 35 | VISIBILITY@41..51 |
30 | PUB_KW@41..44 "pub" | 36 | PUB_KW@41..44 "pub" |
31 | L_PAREN@44..45 "(" | 37 | L_PAREN@44..45 "(" |
32 | SELF_KW@45..49 "self" | 38 | PATH@45..50 |
33 | R_PAREN@49..50 ")" | 39 | PATH_SEGMENT@45..50 |
34 | WHITESPACE@50..51 " " | 40 | NAME_REF@45..50 |
35 | STRUCT_KW@51..57 "struct" | 41 | SUPER_KW@45..50 "super" |
36 | WHITESPACE@57..58 " " | 42 | R_PAREN@50..51 ")" |
37 | NAME@58..59 | 43 | WHITESPACE@51..52 " " |
38 | IDENT@58..59 "S" | 44 | STRUCT_KW@52..58 "struct" |
39 | SEMICOLON@59..60 ";" | 45 | WHITESPACE@58..59 " " |
40 | WHITESPACE@60..61 "\n" | 46 | NAME@59..60 |
41 | STRUCT@61..80 | 47 | IDENT@59..60 "S" |
42 | VISIBILITY@61..70 | 48 | SEMICOLON@60..61 ";" |
43 | PUB_KW@61..64 "pub" | 49 | WHITESPACE@61..62 "\n" |
44 | L_PAREN@64..65 "(" | ||
45 | SELF_KW@65..69 "self" | ||
46 | R_PAREN@69..70 ")" | ||
47 | WHITESPACE@70..71 " " | ||
48 | STRUCT_KW@71..77 "struct" | ||
49 | WHITESPACE@77..78 " " | ||
50 | NAME@78..79 | ||
51 | IDENT@78..79 "S" | ||
52 | SEMICOLON@79..80 ";" | ||
53 | WHITESPACE@80..81 "\n" | ||
diff --git a/crates/syntax/test_data/parser/inline/ok/0022_crate_visibility.rs b/crates/syntax/test_data/parser/inline/ok/0022_crate_visibility.rs index faeefde94..a790a485f 100644 --- a/crates/syntax/test_data/parser/inline/ok/0022_crate_visibility.rs +++ b/crates/syntax/test_data/parser/inline/ok/0022_crate_visibility.rs | |||
@@ -1,4 +1,3 @@ | |||
1 | pub(crate) struct S; | 1 | pub(crate) struct S; |
2 | pub(self) struct S; | 2 | pub(self) struct S; |
3 | pub(self) struct S; | 3 | pub(super) struct S; |
4 | pub(self) struct S; | ||
diff --git a/crates/syntax/test_data/parser/inline/ok/0138_self_param_outer_attr.rast b/crates/syntax/test_data/parser/inline/ok/0138_self_param_outer_attr.rast index d3219f0b2..c54e64e3f 100644 --- a/crates/syntax/test_data/parser/inline/ok/0138_self_param_outer_attr.rast +++ b/crates/syntax/test_data/parser/inline/ok/0138_self_param_outer_attr.rast | |||
@@ -16,7 +16,8 @@ SOURCE_FILE@0..26 | |||
16 | IDENT@7..15 "must_use" | 16 | IDENT@7..15 "must_use" |
17 | R_BRACK@15..16 "]" | 17 | R_BRACK@15..16 "]" |
18 | WHITESPACE@16..17 " " | 18 | WHITESPACE@16..17 " " |
19 | SELF_KW@17..21 "self" | 19 | NAME@17..21 |
20 | SELF_KW@17..21 "self" | ||
20 | R_PAREN@21..22 ")" | 21 | R_PAREN@21..22 ")" |
21 | WHITESPACE@22..23 " " | 22 | WHITESPACE@22..23 " " |
22 | BLOCK_EXPR@23..25 | 23 | BLOCK_EXPR@23..25 |
diff --git a/crates/syntax/test_data/parser/inline/ok/0160_crate_visibility_in.rast b/crates/syntax/test_data/parser/inline/ok/0160_crate_visibility_in.rast new file mode 100644 index 000000000..3d855fc6b --- /dev/null +++ b/crates/syntax/test_data/parser/inline/ok/0160_crate_visibility_in.rast | |||
@@ -0,0 +1,42 @@ | |||
1 | SOURCE_FILE@0..51 | ||
2 | STRUCT@0..26 | ||
3 | VISIBILITY@0..16 | ||
4 | PUB_KW@0..3 "pub" | ||
5 | L_PAREN@3..4 "(" | ||
6 | IN_KW@4..6 "in" | ||
7 | WHITESPACE@6..7 " " | ||
8 | PATH@7..15 | ||
9 | PATH@7..12 | ||
10 | PATH_SEGMENT@7..12 | ||
11 | NAME_REF@7..12 | ||
12 | SUPER_KW@7..12 "super" | ||
13 | COLON2@12..14 "::" | ||
14 | PATH_SEGMENT@14..15 | ||
15 | NAME_REF@14..15 | ||
16 | IDENT@14..15 "A" | ||
17 | R_PAREN@15..16 ")" | ||
18 | WHITESPACE@16..17 " " | ||
19 | STRUCT_KW@17..23 "struct" | ||
20 | WHITESPACE@23..24 " " | ||
21 | NAME@24..25 | ||
22 | IDENT@24..25 "S" | ||
23 | SEMICOLON@25..26 ";" | ||
24 | WHITESPACE@26..27 "\n" | ||
25 | STRUCT@27..50 | ||
26 | VISIBILITY@27..40 | ||
27 | PUB_KW@27..30 "pub" | ||
28 | L_PAREN@30..31 "(" | ||
29 | IN_KW@31..33 "in" | ||
30 | WHITESPACE@33..34 " " | ||
31 | PATH@34..39 | ||
32 | PATH_SEGMENT@34..39 | ||
33 | NAME_REF@34..39 | ||
34 | CRATE_KW@34..39 "crate" | ||
35 | R_PAREN@39..40 ")" | ||
36 | WHITESPACE@40..41 " " | ||
37 | STRUCT_KW@41..47 "struct" | ||
38 | WHITESPACE@47..48 " " | ||
39 | NAME@48..49 | ||
40 | IDENT@48..49 "S" | ||
41 | SEMICOLON@49..50 ";" | ||
42 | WHITESPACE@50..51 "\n" | ||
diff --git a/crates/syntax/test_data/parser/inline/ok/0160_crate_visibility_in.rs b/crates/syntax/test_data/parser/inline/ok/0160_crate_visibility_in.rs new file mode 100644 index 000000000..2856dbd84 --- /dev/null +++ b/crates/syntax/test_data/parser/inline/ok/0160_crate_visibility_in.rs | |||
@@ -0,0 +1,2 @@ | |||
1 | pub(in super::A) struct S; | ||
2 | pub(in crate) struct S; | ||