diff options
author | bors[bot] <bors[bot]@users.noreply.github.com> | 2019-01-25 21:25:01 +0000 |
---|---|---|
committer | bors[bot] <bors[bot]@users.noreply.github.com> | 2019-01-25 21:25:01 +0000 |
commit | 154ab4206d2fd9493a3665fb72f9bd710a577944 (patch) | |
tree | b6d0912779ecb18ec278339d8a40303e172647be /crates/ra_syntax/tests | |
parent | 3c7acecade09e1234ac7b1d1ed2f22edbc543f64 (diff) | |
parent | 23172a116c3cc4ca9a692dfdd05051d1a4aee2b2 (diff) |
Merge #658
658: rename POS_FIELD -> POS_FIELD_DEF r=matklad a=matklad
Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates/ra_syntax/tests')
8 files changed, 26 insertions, 26 deletions
diff --git a/crates/ra_syntax/tests/data/parser/err/0013_invalid_type.txt b/crates/ra_syntax/tests/data/parser/err/0013_invalid_type.txt index 83d716b2f..1ec15194c 100644 --- a/crates/ra_syntax/tests/data/parser/err/0013_invalid_type.txt +++ b/crates/ra_syntax/tests/data/parser/err/0013_invalid_type.txt | |||
@@ -7,10 +7,10 @@ SOURCE_FILE@[0; 86) | |||
7 | WHITESPACE@[10; 11) | 7 | WHITESPACE@[10; 11) |
8 | NAME@[11; 16) | 8 | NAME@[11; 16) |
9 | IDENT@[11; 16) "Cache" | 9 | IDENT@[11; 16) "Cache" |
10 | POS_FIELD_LIST@[16; 72) | 10 | POS_FIELD_DEF_LIST@[16; 72) |
11 | L_PAREN@[16; 17) | 11 | L_PAREN@[16; 17) |
12 | WHITESPACE@[17; 22) | 12 | WHITESPACE@[17; 22) |
13 | POS_FIELD@[22; 68) | 13 | POS_FIELD_DEF@[22; 68) |
14 | PATH_TYPE@[22; 68) | 14 | PATH_TYPE@[22; 68) |
15 | PATH@[22; 68) | 15 | PATH@[22; 68) |
16 | PATH_SEGMENT@[22; 68) | 16 | PATH_SEGMENT@[22; 68) |
@@ -55,7 +55,7 @@ SOURCE_FILE@[0; 86) | |||
55 | err: `expected R_ANGLE` | 55 | err: `expected R_ANGLE` |
56 | err: `expected COMMA` | 56 | err: `expected COMMA` |
57 | WHITESPACE@[68; 69) | 57 | WHITESPACE@[68; 69) |
58 | POS_FIELD@[69; 72) | 58 | POS_FIELD_DEF@[69; 72) |
59 | PATH_TYPE@[69; 72) | 59 | PATH_TYPE@[69; 72) |
60 | PATH@[69; 72) | 60 | PATH@[69; 72) |
61 | PATH_SEGMENT@[69; 72) | 61 | PATH_SEGMENT@[69; 72) |
diff --git a/crates/ra_syntax/tests/data/parser/err/0025_nope.txt b/crates/ra_syntax/tests/data/parser/err/0025_nope.txt index 615064f77..e0824ca56 100644 --- a/crates/ra_syntax/tests/data/parser/err/0025_nope.txt +++ b/crates/ra_syntax/tests/data/parser/err/0025_nope.txt | |||
@@ -28,9 +28,9 @@ SOURCE_FILE@[0; 575) | |||
28 | ENUM_VARIANT@[50; 62) | 28 | ENUM_VARIANT@[50; 62) |
29 | NAME@[50; 54) | 29 | NAME@[50; 54) |
30 | IDENT@[50; 54) "Var2" | 30 | IDENT@[50; 54) "Var2" |
31 | POS_FIELD_LIST@[54; 62) | 31 | POS_FIELD_DEF_LIST@[54; 62) |
32 | L_PAREN@[54; 55) | 32 | L_PAREN@[54; 55) |
33 | POS_FIELD@[55; 61) | 33 | POS_FIELD_DEF@[55; 61) |
34 | PATH_TYPE@[55; 61) | 34 | PATH_TYPE@[55; 61) |
35 | PATH@[55; 61) | 35 | PATH@[55; 61) |
36 | PATH_SEGMENT@[55; 61) | 36 | PATH_SEGMENT@[55; 61) |
@@ -151,9 +151,9 @@ SOURCE_FILE@[0; 575) | |||
151 | ENUM_VARIANT@[363; 372) | 151 | ENUM_VARIANT@[363; 372) |
152 | NAME@[363; 367) | 152 | NAME@[363; 367) |
153 | IDENT@[363; 367) "Nope" | 153 | IDENT@[363; 367) "Nope" |
154 | POS_FIELD_LIST@[367; 372) | 154 | POS_FIELD_DEF_LIST@[367; 372) |
155 | L_PAREN@[367; 368) | 155 | L_PAREN@[367; 368) |
156 | POS_FIELD@[368; 371) | 156 | POS_FIELD_DEF@[368; 371) |
157 | PATH_TYPE@[368; 371) | 157 | PATH_TYPE@[368; 371) |
158 | PATH@[368; 371) | 158 | PATH@[368; 371) |
159 | PATH_SEGMENT@[368; 371) | 159 | PATH_SEGMENT@[368; 371) |
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0083_struct_items.txt b/crates/ra_syntax/tests/data/parser/inline/ok/0083_struct_items.txt index 058639375..6247729f6 100644 --- a/crates/ra_syntax/tests/data/parser/inline/ok/0083_struct_items.txt +++ b/crates/ra_syntax/tests/data/parser/inline/ok/0083_struct_items.txt | |||
@@ -21,7 +21,7 @@ SOURCE_FILE@[0; 106) | |||
21 | WHITESPACE@[32; 33) | 21 | WHITESPACE@[32; 33) |
22 | NAME@[33; 36) | 22 | NAME@[33; 36) |
23 | IDENT@[33; 36) "Foo" | 23 | IDENT@[33; 36) "Foo" |
24 | POS_FIELD_LIST@[36; 38) | 24 | POS_FIELD_DEF_LIST@[36; 38) |
25 | L_PAREN@[36; 37) | 25 | L_PAREN@[36; 37) |
26 | R_PAREN@[37; 38) | 26 | R_PAREN@[37; 38) |
27 | SEMI@[38; 39) | 27 | SEMI@[38; 39) |
@@ -31,9 +31,9 @@ SOURCE_FILE@[0; 106) | |||
31 | WHITESPACE@[46; 47) | 31 | WHITESPACE@[46; 47) |
32 | NAME@[47; 50) | 32 | NAME@[47; 50) |
33 | IDENT@[47; 50) "Foo" | 33 | IDENT@[47; 50) "Foo" |
34 | POS_FIELD_LIST@[50; 65) | 34 | POS_FIELD_DEF_LIST@[50; 65) |
35 | L_PAREN@[50; 51) | 35 | L_PAREN@[50; 51) |
36 | POS_FIELD@[51; 57) | 36 | POS_FIELD_DEF@[51; 57) |
37 | PATH_TYPE@[51; 57) | 37 | PATH_TYPE@[51; 57) |
38 | PATH@[51; 57) | 38 | PATH@[51; 57) |
39 | PATH_SEGMENT@[51; 57) | 39 | PATH_SEGMENT@[51; 57) |
@@ -41,7 +41,7 @@ SOURCE_FILE@[0; 106) | |||
41 | IDENT@[51; 57) "String" | 41 | IDENT@[51; 57) "String" |
42 | COMMA@[57; 58) | 42 | COMMA@[57; 58) |
43 | WHITESPACE@[58; 59) | 43 | WHITESPACE@[58; 59) |
44 | POS_FIELD@[59; 64) | 44 | POS_FIELD_DEF@[59; 64) |
45 | PATH_TYPE@[59; 64) | 45 | PATH_TYPE@[59; 64) |
46 | PATH@[59; 64) | 46 | PATH@[59; 64) |
47 | PATH_SEGMENT@[59; 64) | 47 | PATH_SEGMENT@[59; 64) |
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0114_tuple_struct_where.txt b/crates/ra_syntax/tests/data/parser/inline/ok/0114_tuple_struct_where.txt index b7de83072..4f439f21c 100644 --- a/crates/ra_syntax/tests/data/parser/inline/ok/0114_tuple_struct_where.txt +++ b/crates/ra_syntax/tests/data/parser/inline/ok/0114_tuple_struct_where.txt | |||
@@ -10,9 +10,9 @@ SOURCE_FILE@[0; 53) | |||
10 | NAME@[12; 13) | 10 | NAME@[12; 13) |
11 | IDENT@[12; 13) "T" | 11 | IDENT@[12; 13) "T" |
12 | R_ANGLE@[13; 14) | 12 | R_ANGLE@[13; 14) |
13 | POS_FIELD_LIST@[14; 17) | 13 | POS_FIELD_DEF_LIST@[14; 17) |
14 | L_PAREN@[14; 15) | 14 | L_PAREN@[14; 15) |
15 | POS_FIELD@[15; 16) | 15 | POS_FIELD_DEF@[15; 16) |
16 | PATH_TYPE@[15; 16) | 16 | PATH_TYPE@[15; 16) |
17 | PATH@[15; 16) | 17 | PATH@[15; 16) |
18 | PATH_SEGMENT@[15; 16) | 18 | PATH_SEGMENT@[15; 16) |
@@ -49,9 +49,9 @@ SOURCE_FILE@[0; 53) | |||
49 | NAME@[46; 47) | 49 | NAME@[46; 47) |
50 | IDENT@[46; 47) "T" | 50 | IDENT@[46; 47) "T" |
51 | R_ANGLE@[47; 48) | 51 | R_ANGLE@[47; 48) |
52 | POS_FIELD_LIST@[48; 51) | 52 | POS_FIELD_DEF_LIST@[48; 51) |
53 | L_PAREN@[48; 49) | 53 | L_PAREN@[48; 49) |
54 | POS_FIELD@[49; 50) | 54 | POS_FIELD_DEF@[49; 50) |
55 | PATH_TYPE@[49; 50) | 55 | PATH_TYPE@[49; 50) |
56 | PATH@[49; 50) | 56 | PATH@[49; 50) |
57 | PATH_SEGMENT@[49; 50) | 57 | PATH_SEGMENT@[49; 50) |
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0115_pos_field_attrs.txt b/crates/ra_syntax/tests/data/parser/inline/ok/0115_pos_field_attrs.txt index 99ec0755b..4da84ba48 100644 --- a/crates/ra_syntax/tests/data/parser/inline/ok/0115_pos_field_attrs.txt +++ b/crates/ra_syntax/tests/data/parser/inline/ok/0115_pos_field_attrs.txt | |||
@@ -5,10 +5,10 @@ SOURCE_FILE@[0; 60) | |||
5 | NAME@[7; 8) | 5 | NAME@[7; 8) |
6 | IDENT@[7; 8) "S" | 6 | IDENT@[7; 8) "S" |
7 | WHITESPACE@[8; 9) | 7 | WHITESPACE@[8; 9) |
8 | POS_FIELD_LIST@[9; 58) | 8 | POS_FIELD_DEF_LIST@[9; 58) |
9 | L_PAREN@[9; 10) | 9 | L_PAREN@[9; 10) |
10 | WHITESPACE@[10; 15) | 10 | WHITESPACE@[10; 15) |
11 | POS_FIELD@[15; 55) | 11 | POS_FIELD_DEF@[15; 55) |
12 | ATTR@[15; 43) | 12 | ATTR@[15; 43) |
13 | POUND@[15; 16) | 13 | POUND@[15; 16) |
14 | TOKEN_TREE@[16; 43) | 14 | TOKEN_TREE@[16; 43) |
diff --git a/crates/ra_syntax/tests/data/parser/ok/0016_struct_flavors.txt b/crates/ra_syntax/tests/data/parser/ok/0016_struct_flavors.txt index 1d355823d..d021d6de6 100644 --- a/crates/ra_syntax/tests/data/parser/ok/0016_struct_flavors.txt +++ b/crates/ra_syntax/tests/data/parser/ok/0016_struct_flavors.txt | |||
@@ -21,7 +21,7 @@ SOURCE_FILE@[0; 97) | |||
21 | WHITESPACE@[28; 29) | 21 | WHITESPACE@[28; 29) |
22 | NAME@[29; 30) | 22 | NAME@[29; 30) |
23 | IDENT@[29; 30) "C" | 23 | IDENT@[29; 30) "C" |
24 | POS_FIELD_LIST@[30; 32) | 24 | POS_FIELD_DEF_LIST@[30; 32) |
25 | L_PAREN@[30; 31) | 25 | L_PAREN@[30; 31) |
26 | R_PAREN@[31; 32) | 26 | R_PAREN@[31; 32) |
27 | SEMI@[32; 33) | 27 | SEMI@[32; 33) |
@@ -68,9 +68,9 @@ SOURCE_FILE@[0; 97) | |||
68 | WHITESPACE@[82; 83) | 68 | WHITESPACE@[82; 83) |
69 | NAME@[83; 84) | 69 | NAME@[83; 84) |
70 | IDENT@[83; 84) "E" | 70 | IDENT@[83; 84) "E" |
71 | POS_FIELD_LIST@[84; 95) | 71 | POS_FIELD_DEF_LIST@[84; 95) |
72 | L_PAREN@[84; 85) | 72 | L_PAREN@[84; 85) |
73 | POS_FIELD@[85; 90) | 73 | POS_FIELD_DEF@[85; 90) |
74 | VISIBILITY@[85; 88) | 74 | VISIBILITY@[85; 88) |
75 | PUB_KW@[85; 88) | 75 | PUB_KW@[85; 88) |
76 | WHITESPACE@[88; 89) | 76 | WHITESPACE@[88; 89) |
@@ -81,7 +81,7 @@ SOURCE_FILE@[0; 97) | |||
81 | IDENT@[89; 90) "x" | 81 | IDENT@[89; 90) "x" |
82 | COMMA@[90; 91) | 82 | COMMA@[90; 91) |
83 | WHITESPACE@[91; 92) | 83 | WHITESPACE@[91; 92) |
84 | POS_FIELD@[92; 93) | 84 | POS_FIELD_DEF@[92; 93) |
85 | PATH_TYPE@[92; 93) | 85 | PATH_TYPE@[92; 93) |
86 | PATH@[92; 93) | 86 | PATH@[92; 93) |
87 | PATH_SEGMENT@[92; 93) | 87 | PATH_SEGMENT@[92; 93) |
diff --git a/crates/ra_syntax/tests/data/parser/ok/0018_struct_type_params.txt b/crates/ra_syntax/tests/data/parser/ok/0018_struct_type_params.txt index 491d154df..05480c81b 100644 --- a/crates/ra_syntax/tests/data/parser/ok/0018_struct_type_params.txt +++ b/crates/ra_syntax/tests/data/parser/ok/0018_struct_type_params.txt | |||
@@ -23,9 +23,9 @@ SOURCE_FILE@[0; 290) | |||
23 | NAME@[24; 25) | 23 | NAME@[24; 25) |
24 | IDENT@[24; 25) "T" | 24 | IDENT@[24; 25) "T" |
25 | R_ANGLE@[25; 26) | 25 | R_ANGLE@[25; 26) |
26 | POS_FIELD_LIST@[26; 31) | 26 | POS_FIELD_DEF_LIST@[26; 31) |
27 | L_PAREN@[26; 27) | 27 | L_PAREN@[26; 27) |
28 | POS_FIELD@[27; 30) | 28 | POS_FIELD_DEF@[27; 30) |
29 | PATH_TYPE@[27; 30) | 29 | PATH_TYPE@[27; 30) |
30 | PATH@[27; 30) | 30 | PATH@[27; 30) |
31 | PATH_SEGMENT@[27; 30) | 31 | PATH_SEGMENT@[27; 30) |
diff --git a/crates/ra_syntax/tests/data/parser/ok/0019_enums.txt b/crates/ra_syntax/tests/data/parser/ok/0019_enums.txt index 6925219e8..2ac55cfbc 100644 --- a/crates/ra_syntax/tests/data/parser/ok/0019_enums.txt +++ b/crates/ra_syntax/tests/data/parser/ok/0019_enums.txt | |||
@@ -131,9 +131,9 @@ SOURCE_FILE@[0; 182) | |||
131 | ENUM_VARIANT@[162; 169) | 131 | ENUM_VARIANT@[162; 169) |
132 | NAME@[162; 163) | 132 | NAME@[162; 163) |
133 | IDENT@[162; 163) "D" | 133 | IDENT@[162; 163) "D" |
134 | POS_FIELD_LIST@[163; 169) | 134 | POS_FIELD_DEF_LIST@[163; 169) |
135 | L_PAREN@[163; 164) | 135 | L_PAREN@[163; 164) |
136 | POS_FIELD@[164; 167) | 136 | POS_FIELD_DEF@[164; 167) |
137 | PATH_TYPE@[164; 167) | 137 | PATH_TYPE@[164; 167) |
138 | PATH@[164; 167) | 138 | PATH@[164; 167) |
139 | PATH_SEGMENT@[164; 167) | 139 | PATH_SEGMENT@[164; 167) |
@@ -146,7 +146,7 @@ SOURCE_FILE@[0; 182) | |||
146 | ENUM_VARIANT@[175; 178) | 146 | ENUM_VARIANT@[175; 178) |
147 | NAME@[175; 176) | 147 | NAME@[175; 176) |
148 | IDENT@[175; 176) "E" | 148 | IDENT@[175; 176) "E" |
149 | POS_FIELD_LIST@[176; 178) | 149 | POS_FIELD_DEF_LIST@[176; 178) |
150 | L_PAREN@[176; 177) | 150 | L_PAREN@[176; 177) |
151 | R_PAREN@[177; 178) | 151 | R_PAREN@[177; 178) |
152 | COMMA@[178; 179) | 152 | COMMA@[178; 179) |