1 files changed, 34 insertions, 34 deletions
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 451634e3f..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,10 +1,10 @@
 [email protected]
-  STRUCT_DEF@0..13
+  [email protected]
    [email protected] "struct"
    [email protected] " "
    [email protected]
      [email protected] "S1"
-    TYP[email protected]
+    GENERIC[email protected]
      [email protected] "<"
      [email protected]
        [email protected]
@@ -12,20 +12,20 @@ [email protected]
      [email protected] ">"
    [email protected] ";"
  [email protected] "\n"
-  STRUCT_DEF@14..32
+  [email protected]
    [email protected] "struct"
    [email protected] " "
    [email protected]
      [email protected] "S2"
-    TYP[email protected]
+    GENERIC[email protected]
      [email protected] "<"
      [email protected]
        [email protected]
          [email protected] "T"
      [email protected] ">"
-    TUPLE_FIELD_DEF_[email protected]
+    [email protected]
      [email protected] "("
-      TUPLE_FIELD_DEF@27..30
+      [email protected]
        [email protected]
          [email protected]
            [email protected]
@@ -34,22 +34,22 @@ [email protected]
      [email protected] ")"
    [email protected] ";"
  [email protected] "\n"
-  STRUCT_DEF@33..56
+  [email protected]
    [email protected] "struct"
    [email protected] " "
    [email protected]
      [email protected] "S3"
-    TYP[email protected]
+    GENERIC[email protected]
      [email protected] "<"
      [email protected]
        [email protected]
          [email protected] "T"
      [email protected] ">"
    [email protected] " "
-    RECORD_FIELD_DEF_[email protected]
+    [email protected]
      [email protected] "{"
      [email protected] " "
-      RECORD_FIELD_DEF@48..54
+      [email protected]
        [email protected]
          [email protected] "u"
        [email protected] ":"
@@ -62,34 +62,34 @@ [email protected]
      [email protected] " "
      [email protected] "}"
  [email protected] "\n\n"
-  STRUCT_DEF@58..70
+  [email protected]
    [email protected] "struct"
    [email protected] " "
    [email protected]
      [email protected] "S4"
-    TYP[email protected]
+    GENERIC[email protected]
      [email protected] "<"
      [email protected] ">"
    [email protected] ";"
  [email protected] "\n"
-  STRUCT_DEF@71..85
+  [email protected]
    [email protected] "struct"
    [email protected] " "
    [email protected]
      [email protected] "S5"
-    TYP[email protected]
+    GENERIC[email protected]
      [email protected] "<"
      [email protected]
        [email protected] "\'a"
      [email protected] ">"
    [email protected] ";"
  [email protected] "\n"
-  STRUCT_DEF@86..101
+  [email protected]
    [email protected] "struct"
    [email protected] " "
    [email protected]
      [email protected] "S6"
-    TYP[email protected]
+    GENERIC[email protected]
      [email protected] "<"
      [email protected]
        [email protected] "\'a"
@@ -97,12 +97,12 @@ [email protected]
      [email protected] ">"
    [email protected] ";"
  [email protected] "\n"
-  STRUCT_DEF@102..120
+  [email protected]
    [email protected] "struct"
    [email protected] " "
    [email protected]
      [email protected] "S7"
-    TYP[email protected]
+    GENERIC[email protected]
      [email protected] "<"
      [email protected]
        [email protected] "\'a"
@@ -112,12 +112,12 @@ [email protected]
      [email protected] ">"
    [email protected] ";"
  [email protected] "\n"
-  STRUCT_DEF@121..142
+  [email protected]
    [email protected] "struct"
    [email protected] " "
    [email protected]
      [email protected] "S8"
-    TYP[email protected]
+    GENERIC[email protected]
      [email protected] "<"
      [email protected]
        [email protected] "\'a"
@@ -130,12 +130,12 @@ [email protected]
      [email protected] ">"
    [email protected] ";"
  [email protected] "\n"
-  STRUCT_DEF@143..166
+  [email protected]
    [email protected] "struct"
    [email protected] " "
    [email protected]
      [email protected] "S9"
-    TYP[email protected]
+    GENERIC[email protected]
      [email protected] "<"
      [email protected]
        [email protected] "\'a"
@@ -149,12 +149,12 @@ [email protected]
      [email protected] ">"
    [email protected] ";"
  [email protected] "\n"
-  STRUCT_DEF@167..183
+  [email protected]
    [email protected] "struct"
    [email protected] " "
    [email protected]
      [email protected] "S10"
-    TYP[email protected]
+    GENERIC[email protected]
      [email protected] "<"
      [email protected]
        [email protected] "\'a"
@@ -162,12 +162,12 @@ [email protected]
      [email protected] ">"
    [email protected] ";"
  [email protected] "\n"
-  STRUCT_DEF@184..203
+  [email protected]
    [email protected] "struct"
    [email protected] " "
    [email protected]
      [email protected] "S11"
-    TYP[email protected]
+    GENERIC[email protected]
      [email protected] "<"
      [email protected]
        [email protected] "\'a"
@@ -178,12 +178,12 @@ [email protected]
      [email protected] ">"
    [email protected] ";"
  [email protected] "\n"
-  STRUCT_DEF@204..233
+  [email protected]
    [email protected] "struct"
    [email protected] " "
    [email protected]
      [email protected] "S12"
-    TYP[email protected]
+    GENERIC[email protected]
      [email protected] "<"
      [email protected]
        [email protected] "\'a"
@@ -202,12 +202,12 @@ [email protected]
      [email protected] ">"
    [email protected] ";"
  [email protected] "\n\n"
-  STRUCT_DEF@235..249
+  [email protected]
    [email protected] "struct"
    [email protected] " "
    [email protected]
      [email protected] "S13"
-    TYP[email protected]
+    GENERIC[email protected]
      [email protected] "<"
      [email protected]
        [email protected]
@@ -215,12 +215,12 @@ [email protected]
      [email protected] ">"
    [email protected] ";"
  [email protected] "\n"
-  STRUCT_DEF@250..267
+  [email protected]
    [email protected] "struct"
    [email protected] " "
    [email protected]
      [email protected] "S14"
-    TYP[email protected]
+    GENERIC[email protected]
      [email protected] "<"
      [email protected]
        [email protected]
@@ -233,12 +233,12 @@ [email protected]
      [email protected] ">"
    [email protected] ";"
  [email protected] "\n"
-  STRUCT_DEF@268..289
+  [email protected]
    [email protected] "struct"
    [email protected] " "
    [email protected]
      [email protected] "S15"
-    TYP[email protected]
+    GENERIC[email protected]
      [email protected] "<"
      [email protected]
        [email protected] "\'a"

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 451634e3f..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,10 +1,10 @@
1	[email protected]	1	[email protected]
2	STRUCT_DEF@0..13	2	[email protected]
3	[email protected] "struct"	3	[email protected] "struct"
4	[email protected] " "	4	[email protected] " "
5	[email protected]	5	[email protected]
6	[email protected] "S1"	6	[email protected] "S1"
7	TYP[email protected]	7	GENERIC[email protected]
8	[email protected] "<"	8	[email protected] "<"
9	[email protected]	9	[email protected]
10	[email protected]	10	[email protected]
@@ -12,20 +12,20 @@ [email protected]
12	[email protected] ">"	12	[email protected] ">"
13	[email protected] ";"	13	[email protected] ";"
14	[email protected] "\n"	14	[email protected] "\n"
15	STRUCT_DEF@14..32	15	[email protected]
16	[email protected] "struct"	16	[email protected] "struct"
17	[email protected] " "	17	[email protected] " "
18	[email protected]	18	[email protected]
19	[email protected] "S2"	19	[email protected] "S2"
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]
24	[email protected] "T"	24	[email protected] "T"
25	[email protected] ">"	25	[email protected] ">"
26	TUPLE_FIELD_DEF_[email protected]	26	[email protected]
27	[email protected] "("	27	[email protected] "("
28	TUPLE_FIELD_DEF@27..30	28	[email protected]
29	[email protected]	29	[email protected]
30	[email protected]	30	[email protected]
31	[email protected]	31	[email protected]
@@ -34,22 +34,22 @@ [email protected]
34	[email protected] ")"	34	[email protected] ")"
35	[email protected] ";"	35	[email protected] ";"
36	[email protected] "\n"	36	[email protected] "\n"
37	STRUCT_DEF@33..56	37	[email protected]
38	[email protected] "struct"	38	[email protected] "struct"
39	[email protected] " "	39	[email protected] " "
40	[email protected]	40	[email protected]
41	[email protected] "S3"	41	[email protected] "S3"
42	TYP[email protected]	42	GENERIC[email protected]
43	[email protected] "<"	43	[email protected] "<"
44	[email protected]	44	[email protected]
45	[email protected]	45	[email protected]
46	[email protected] "T"	46	[email protected] "T"
47	[email protected] ">"	47	[email protected] ">"
48	[email protected] " "	48	[email protected] " "
49	RECORD_FIELD_DEF_[email protected]	49	[email protected]
50	[email protected] "{"	50	[email protected] "{"
51	[email protected] " "	51	[email protected] " "
52	RECORD_FIELD_DEF@48..54	52	[email protected]
53	[email protected]	53	[email protected]
54	[email protected] "u"	54	[email protected] "u"
55	[email protected] ":"	55	[email protected] ":"
@@ -62,34 +62,34 @@ [email protected]
62	[email protected] " "	62	[email protected] " "
63	[email protected] "}"	63	[email protected] "}"
64	[email protected] "\n\n"	64	[email protected] "\n\n"
65	STRUCT_DEF@58..70	65	[email protected]
66	[email protected] "struct"	66	[email protected] "struct"
67	[email protected] " "	67	[email protected] " "
68	[email protected]	68	[email protected]
69	[email protected] "S4"	69	[email protected] "S4"
70	TYP[email protected]	70	GENERIC[email protected]
71	[email protected] "<"	71	[email protected] "<"
72	[email protected] ">"	72	[email protected] ">"
73	[email protected] ";"	73	[email protected] ";"
74	[email protected] "\n"	74	[email protected] "\n"
75	STRUCT_DEF@71..85	75	[email protected]
76	[email protected] "struct"	76	[email protected] "struct"
77	[email protected] " "	77	[email protected] " "
78	[email protected]	78	[email protected]
79	[email protected] "S5"	79	[email protected] "S5"
80	TYP[email protected]	80	GENERIC[email protected]
81	[email protected] "<"	81	[email protected] "<"
82	[email protected]	82	[email protected]
83	[email protected] "\'a"	83	[email protected] "\'a"
84	[email protected] ">"	84	[email protected] ">"
85	[email protected] ";"	85	[email protected] ";"
86	[email protected] "\n"	86	[email protected] "\n"
87	STRUCT_DEF@86..101	87	[email protected]
88	[email protected] "struct"	88	[email protected] "struct"
89	[email protected] " "	89	[email protected] " "
90	[email protected]	90	[email protected]
91	[email protected] "S6"	91	[email protected] "S6"
92	TYP[email protected]	92	GENERIC[email protected]
93	[email protected] "<"	93	[email protected] "<"
94	[email protected]	94	[email protected]
95	[email protected] "\'a"	95	[email protected] "\'a"
@@ -97,12 +97,12 @@ [email protected]
97	[email protected] ">"	97	[email protected] ">"
98	[email protected] ";"	98	[email protected] ";"
99	[email protected] "\n"	99	[email protected] "\n"
100	STRUCT_DEF@102..120	100	[email protected]
101	[email protected] "struct"	101	[email protected] "struct"
102	[email protected] " "	102	[email protected] " "
103	[email protected]	103	[email protected]
104	[email protected] "S7"	104	[email protected] "S7"
105	TYP[email protected]	105	GENERIC[email protected]
106	[email protected] "<"	106	[email protected] "<"
107	[email protected]	107	[email protected]
108	[email protected] "\'a"	108	[email protected] "\'a"
@@ -112,12 +112,12 @@ [email protected]
112	[email protected] ">"	112	[email protected] ">"
113	[email protected] ";"	113	[email protected] ";"
114	[email protected] "\n"	114	[email protected] "\n"
115	STRUCT_DEF@121..142	115	[email protected]
116	[email protected] "struct"	116	[email protected] "struct"
117	[email protected] " "	117	[email protected] " "
118	[email protected]	118	[email protected]
119	[email protected] "S8"	119	[email protected] "S8"
120	TYP[email protected]	120	GENERIC[email protected]
121	[email protected] "<"	121	[email protected] "<"
122	[email protected]	122	[email protected]
123	[email protected] "\'a"	123	[email protected] "\'a"
@@ -130,12 +130,12 @@ [email protected]
130	[email protected] ">"	130	[email protected] ">"
131	[email protected] ";"	131	[email protected] ";"
132	[email protected] "\n"	132	[email protected] "\n"
133	STRUCT_DEF@143..166	133	[email protected]
134	[email protected] "struct"	134	[email protected] "struct"
135	[email protected] " "	135	[email protected] " "
136	[email protected]	136	[email protected]
137	[email protected] "S9"	137	[email protected] "S9"
138	TYP[email protected]	138	GENERIC[email protected]
139	[email protected] "<"	139	[email protected] "<"
140	[email protected]	140	[email protected]
141	[email protected] "\'a"	141	[email protected] "\'a"
@@ -149,12 +149,12 @@ [email protected]
149	[email protected] ">"	149	[email protected] ">"
150	[email protected] ";"	150	[email protected] ";"
151	[email protected] "\n"	151	[email protected] "\n"
152	STRUCT_DEF@167..183	152	[email protected]
153	[email protected] "struct"	153	[email protected] "struct"
154	[email protected] " "	154	[email protected] " "
155	[email protected]	155	[email protected]
156	[email protected] "S10"	156	[email protected] "S10"
157	TYP[email protected]	157	GENERIC[email protected]
158	[email protected] "<"	158	[email protected] "<"
159	[email protected]	159	[email protected]
160	[email protected] "\'a"	160	[email protected] "\'a"
@@ -162,12 +162,12 @@ [email protected]
162	[email protected] ">"	162	[email protected] ">"
163	[email protected] ";"	163	[email protected] ";"
164	[email protected] "\n"	164	[email protected] "\n"
165	STRUCT_DEF@184..203	165	[email protected]
166	[email protected] "struct"	166	[email protected] "struct"
167	[email protected] " "	167	[email protected] " "
168	[email protected]	168	[email protected]
169	[email protected] "S11"	169	[email protected] "S11"
170	TYP[email protected]	170	GENERIC[email protected]
171	[email protected] "<"	171	[email protected] "<"
172	[email protected]	172	[email protected]
173	[email protected] "\'a"	173	[email protected] "\'a"
@@ -178,12 +178,12 @@ [email protected]
178	[email protected] ">"	178	[email protected] ">"
179	[email protected] ";"	179	[email protected] ";"
180	[email protected] "\n"	180	[email protected] "\n"
181	STRUCT_DEF@204..233	181	[email protected]
182	[email protected] "struct"	182	[email protected] "struct"
183	[email protected] " "	183	[email protected] " "
184	[email protected]	184	[email protected]
185	[email protected] "S12"	185	[email protected] "S12"
186	TYP[email protected]	186	GENERIC[email protected]
187	[email protected] "<"	187	[email protected] "<"
188	[email protected]	188	[email protected]
189	[email protected] "\'a"	189	[email protected] "\'a"
@@ -202,12 +202,12 @@ [email protected]
202	[email protected] ">"	202	[email protected] ">"
203	[email protected] ";"	203	[email protected] ";"
204	[email protected] "\n\n"	204	[email protected] "\n\n"
205	STRUCT_DEF@235..249	205	[email protected]
206	[email protected] "struct"	206	[email protected] "struct"
207	[email protected] " "	207	[email protected] " "
208	[email protected]	208	[email protected]
209	[email protected] "S13"	209	[email protected] "S13"
210	TYP[email protected]	210	GENERIC[email protected]
211	[email protected] "<"	211	[email protected] "<"
212	[email protected]	212	[email protected]
213	[email protected]	213	[email protected]
@@ -215,12 +215,12 @@ [email protected]
215	[email protected] ">"	215	[email protected] ">"
216	[email protected] ";"	216	[email protected] ";"
217	[email protected] "\n"	217	[email protected] "\n"
218	STRUCT_DEF@250..267	218	[email protected]
219	[email protected] "struct"	219	[email protected] "struct"
220	[email protected] " "	220	[email protected] " "
221	[email protected]	221	[email protected]
222	[email protected] "S14"	222	[email protected] "S14"
223	TYP[email protected]	223	GENERIC[email protected]
224	[email protected] "<"	224	[email protected] "<"
225	[email protected]	225	[email protected]
226	[email protected]	226	[email protected]
@@ -233,12 +233,12 @@ [email protected]
233	[email protected] ">"	233	[email protected] ">"
234	[email protected] ";"	234	[email protected] ";"
235	[email protected] "\n"	235	[email protected] "\n"
236	STRUCT_DEF@268..289	236	[email protected]
237	[email protected] "struct"	237	[email protected] "struct"
238	[email protected] " "	238	[email protected] " "
239	[email protected]	239	[email protected]
240	[email protected] "S15"	240	[email protected] "S15"
241	TYP[email protected]	241	GENERIC[email protected]
242	[email protected] "<"	242	[email protected] "<"
243	[email protected]	243	[email protected]
244	[email protected] "\'a"	244	[email protected] "\'a"