1 files changed, 121 insertions, 121 deletions
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0006_self_param.rast b/crates/ra_syntax/test_data/parser/inline/ok/0006_self_param.rast
index 757ac092a..dd41b44e1 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0006_self_param.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0006_self_param.rast
@@ -1,121 +1,121 @@
-SOURCE_FILE@[0; 128)
+SOURCE_FILE@0..128
-  IMPL_DEF@[0; 127)
+  IMPL_DEF@0..127
-    IMPL_KW@[0; 4) "impl"
+    IMPL_KW@0..4 "impl"
-    WHITESPACE@[4; 5) " "
+    WHITESPACE@4..5 " "
-    PATH_TYPE@[5; 6)
+    PATH_TYPE@5..6
-      PATH@[5; 6)
+      PATH@5..6
-        PATH_SEGMENT@[5; 6)
+        PATH_SEGMENT@5..6
-          NAME_REF@[5; 6)
+          NAME_REF@5..6
-            IDENT@[5; 6) "S"
+            IDENT@5..6 "S"
-    WHITESPACE@[6; 7) " "
+    WHITESPACE@6..7 " "
-    ITEM_LIST@[7; 127)
+    ITEM_LIST@7..127
-      L_CURLY@[7; 8) "{"
+      L_CURLY@7..8 "{"
-      WHITESPACE@[8; 13) "\n    "
+      WHITESPACE@8..13 "\n    "
-      FN_DEF@[13; 26)
+      FN_DEF@13..26
-        FN_KW@[13; 15) "fn"
+        FN_KW@13..15 "fn"
-        WHITESPACE@[15; 16) " "
+        WHITESPACE@15..16 " "
-        NAME@[16; 17)
+        NAME@16..17
-          IDENT@[16; 17) "a"
+          IDENT@16..17 "a"
-        PARAM_LIST@[17; 23)
+        PARAM_LIST@17..23
-          L_PAREN@[17; 18) "("
+          L_PAREN@17..18 "("
-          SELF_PARAM@[18; 22)
+          SELF_PARAM@18..22
-            SELF_KW@[18; 22) "self"
+            SELF_KW@18..22 "self"
-          R_PAREN@[22; 23) ")"
+          R_PAREN@22..23 ")"
-        WHITESPACE@[23; 24) " "
+        WHITESPACE@23..24 " "
-        BLOCK_EXPR@[24; 26)
+        BLOCK_EXPR@24..26
-          BLOCK@[24; 26)
+          BLOCK@24..26
-            L_CURLY@[24; 25) "{"
+            L_CURLY@24..25 "{"
-            R_CURLY@[25; 26) "}"
+            R_CURLY@25..26 "}"
-      WHITESPACE@[26; 31) "\n    "
+      WHITESPACE@26..31 "\n    "
-      FN_DEF@[31; 46)
+      FN_DEF@31..46
-        FN_KW@[31; 33) "fn"
+        FN_KW@31..33 "fn"
-        WHITESPACE@[33; 34) " "
+        WHITESPACE@33..34 " "
-        NAME@[34; 35)
+        NAME@34..35
-          IDENT@[34; 35) "b"
+          IDENT@34..35 "b"
-        PARAM_LIST@[35; 43)
+        PARAM_LIST@35..43
-          L_PAREN@[35; 36) "("
+          L_PAREN@35..36 "("
-          SELF_PARAM@[36; 41)
+          SELF_PARAM@36..41
-            AMP@[36; 37) "&"
+            AMP@36..37 "&"
-            SELF_KW@[37; 41) "self"
+            SELF_KW@37..41 "self"
-          COMMA@[41; 42) ","
+          COMMA@41..42 ","
-          R_PAREN@[42; 43) ")"
+          R_PAREN@42..43 ")"
-        WHITESPACE@[43; 44) " "
+        WHITESPACE@43..44 " "
-        BLOCK_EXPR@[44; 46)
+        BLOCK_EXPR@44..46
-          BLOCK@[44; 46)
+          BLOCK@44..46
-            L_CURLY@[44; 45) "{"
+            L_CURLY@44..45 "{"
-            R_CURLY@[45; 46) "}"
+            R_CURLY@45..46 "}"
-      WHITESPACE@[46; 51) "\n    "
+      WHITESPACE@46..51 "\n    "
-      FN_DEF@[51; 69)
+      FN_DEF@51..69
-        FN_KW@[51; 53) "fn"
+        FN_KW@51..53 "fn"
-        WHITESPACE@[53; 54) " "
+        WHITESPACE@53..54 " "
-        NAME@[54; 55)
+        NAME@54..55
-          IDENT@[54; 55) "c"
+          IDENT@54..55 "c"
-        PARAM_LIST@[55; 66)
+        PARAM_LIST@55..66
-          L_PAREN@[55; 56) "("
+          L_PAREN@55..56 "("
-          SELF_PARAM@[56; 64)
+          SELF_PARAM@56..64
-            AMP@[56; 57) "&"
+            AMP@56..57 "&"
-            LIFETIME@[57; 59) "\'a"
+            LIFETIME@57..59 "\'a"
-            WHITESPACE@[59; 60) " "
+            WHITESPACE@59..60 " "
-            SELF_KW@[60; 64) "self"
+            SELF_KW@60..64 "self"
-          COMMA@[64; 65) ","
+          COMMA@64..65 ","
-          R_PAREN@[65; 66) ")"
+          R_PAREN@65..66 ")"
-        WHITESPACE@[66; 67) " "
+        WHITESPACE@66..67 " "
-        BLOCK_EXPR@[67; 69)
+        BLOCK_EXPR@67..69
-          BLOCK@[67; 69)
+          BLOCK@67..69
-            L_CURLY@[67; 68) "{"
+            L_CURLY@67..68 "{"
-            R_CURLY@[68; 69) "}"
+            R_CURLY@68..69 "}"
-      WHITESPACE@[69; 74) "\n    "
+      WHITESPACE@69..74 "\n    "
-      FN_DEF@[74; 103)
+      FN_DEF@74..103
-        FN_KW@[74; 76) "fn"
+        FN_KW@74..76 "fn"
-        WHITESPACE@[76; 77) " "
+        WHITESPACE@76..77 " "
-        NAME@[77; 78)
+        NAME@77..78
-          IDENT@[77; 78) "d"
+          IDENT@77..78 "d"
-        PARAM_LIST@[78; 100)
+        PARAM_LIST@78..100
-          L_PAREN@[78; 79) "("
+          L_PAREN@78..79 "("
-          SELF_PARAM@[79; 91)
+          SELF_PARAM@79..91
-            AMP@[79; 80) "&"
+            AMP@79..80 "&"
-            LIFETIME@[80; 82) "\'a"
+            LIFETIME@80..82 "\'a"
-            WHITESPACE@[82; 83) " "
+            WHITESPACE@82..83 " "
-            MUT_KW@[83; 86) "mut"
+            MUT_KW@83..86 "mut"
-            WHITESPACE@[86; 87) " "
+            WHITESPACE@86..87 " "
-            SELF_KW@[87; 91) "self"
+            SELF_KW@87..91 "self"
-          COMMA@[91; 92) ","
+          COMMA@91..92 ","
-          WHITESPACE@[92; 93) " "
+          WHITESPACE@92..93 " "
-          PARAM@[93; 99)
+          PARAM@93..99
-            BIND_PAT@[93; 94)
+            BIND_PAT@93..94
-              NAME@[93; 94)
+              NAME@93..94
-                IDENT@[93; 94) "x"
+                IDENT@93..94 "x"
-            COLON@[94; 95) ":"
+            COLON@94..95 ":"
-            WHITESPACE@[95; 96) " "
+            WHITESPACE@95..96 " "
-            PATH_TYPE@[96; 99)
+            PATH_TYPE@96..99
-              PATH@[96; 99)
+              PATH@96..99
-                PATH_SEGMENT@[96; 99)
+                PATH_SEGMENT@96..99
-                  NAME_REF@[96; 99)
+                  NAME_REF@96..99
-                    IDENT@[96; 99) "i32"
+                    IDENT@96..99 "i32"
-          R_PAREN@[99; 100) ")"
+          R_PAREN@99..100 ")"
-        WHITESPACE@[100; 101) " "
+        WHITESPACE@100..101 " "
-        BLOCK_EXPR@[101; 103)
+        BLOCK_EXPR@101..103
-          BLOCK@[101; 103)
+          BLOCK@101..103
-            L_CURLY@[101; 102) "{"
+            L_CURLY@101..102 "{"
-            R_CURLY@[102; 103) "}"
+            R_CURLY@102..103 "}"
-      WHITESPACE@[103; 108) "\n    "
+      WHITESPACE@103..108 "\n    "
-      FN_DEF@[108; 125)
+      FN_DEF@108..125
-        FN_KW@[108; 110) "fn"
+        FN_KW@108..110 "fn"
-        WHITESPACE@[110; 111) " "
+        WHITESPACE@110..111 " "
-        NAME@[111; 112)
+        NAME@111..112
-          IDENT@[111; 112) "e"
+          IDENT@111..112 "e"
-        PARAM_LIST@[112; 122)
+        PARAM_LIST@112..122
-          L_PAREN@[112; 113) "("
+          L_PAREN@112..113 "("
-          SELF_PARAM@[113; 121)
+          SELF_PARAM@113..121
-            MUT_KW@[113; 116) "mut"
+            MUT_KW@113..116 "mut"
-            WHITESPACE@[116; 117) " "
+            WHITESPACE@116..117 " "
-            SELF_KW@[117; 121) "self"
+            SELF_KW@117..121 "self"
-          R_PAREN@[121; 122) ")"
+          R_PAREN@121..122 ")"
-        WHITESPACE@[122; 123) " "
+        WHITESPACE@122..123 " "
-        BLOCK_EXPR@[123; 125)
+        BLOCK_EXPR@123..125
-          BLOCK@[123; 125)
+          BLOCK@123..125
-            L_CURLY@[123; 124) "{"
+            L_CURLY@123..124 "{"
-            R_CURLY@[124; 125) "}"
+            R_CURLY@124..125 "}"
-      WHITESPACE@[125; 126) "\n"
+      WHITESPACE@125..126 "\n"
-      R_CURLY@[126; 127) "}"
+      R_CURLY@126..127 "}"
-  WHITESPACE@[127; 128) "\n"
+  WHITESPACE@127..128 "\n"

diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0006_self_param.rast b/crates/ra_syntax/test_data/parser/inline/ok/0006_self_param.rast index 757ac092a..dd41b44e1 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0006_self_param.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0006_self_param.rast
@@ -1,121 +1,121 @@
1	SOURCE_FILE@[0; 128)	1	SOURCE_FILE@0..128
2	IMPL_DEF@[0; 127)	2	IMPL_DEF@0..127
3	IMPL_KW@[0; 4) "impl"	3	IMPL_KW@0..4 "impl"
4	WHITESPACE@[4; 5) " "	4	WHITESPACE@4..5 " "
5	PATH_TYPE@[5; 6)	5	PATH_TYPE@5..6
6	PATH@[5; 6)	6	PATH@5..6
7	PATH_SEGMENT@[5; 6)	7	PATH_SEGMENT@5..6
8	NAME_REF@[5; 6)	8	NAME_REF@5..6
9	IDENT@[5; 6) "S"	9	IDENT@5..6 "S"
10	WHITESPACE@[6; 7) " "	10	WHITESPACE@6..7 " "
11	ITEM_LIST@[7; 127)	11	ITEM_LIST@7..127
12	L_CURLY@[7; 8) "{"	12	L_CURLY@7..8 "{"
13	WHITESPACE@[8; 13) "\n "	13	WHITESPACE@8..13 "\n "
14	FN_DEF@[13; 26)	14	FN_DEF@13..26
15	FN_KW@[13; 15) "fn"	15	FN_KW@13..15 "fn"
16	WHITESPACE@[15; 16) " "	16	WHITESPACE@15..16 " "
17	NAME@[16; 17)	17	NAME@16..17
18	IDENT@[16; 17) "a"	18	IDENT@16..17 "a"
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	SELF_KW@18..22 "self"
23	R_PAREN@[22; 23) ")"	23	R_PAREN@22..23 ")"
24	WHITESPACE@[23; 24) " "	24	WHITESPACE@23..24 " "
25	BLOCK_EXPR@[24; 26)	25	BLOCK_EXPR@24..26
26	BLOCK@[24; 26)	26	BLOCK@24..26
27	L_CURLY@[24; 25) "{"	27	L_CURLY@24..25 "{"
28	R_CURLY@[25; 26) "}"	28	R_CURLY@25..26 "}"
29	WHITESPACE@[26; 31) "\n "	29	WHITESPACE@26..31 "\n "
30	FN_DEF@[31; 46)	30	FN_DEF@31..46
31	FN_KW@[31; 33) "fn"	31	FN_KW@31..33 "fn"
32	WHITESPACE@[33; 34) " "	32	WHITESPACE@33..34 " "
33	NAME@[34; 35)	33	NAME@34..35
34	IDENT@[34; 35) "b"	34	IDENT@34..35 "b"
35	PARAM_LIST@[35; 43)	35	PARAM_LIST@35..43
36	L_PAREN@[35; 36) "("	36	L_PAREN@35..36 "("
37	SELF_PARAM@[36; 41)	37	SELF_PARAM@36..41
38	AMP@[36; 37) "&"	38	AMP@36..37 "&"
39	SELF_KW@[37; 41) "self"	39	SELF_KW@37..41 "self"
40	COMMA@[41; 42) ","	40	COMMA@41..42 ","
41	R_PAREN@[42; 43) ")"	41	R_PAREN@42..43 ")"
42	WHITESPACE@[43; 44) " "	42	WHITESPACE@43..44 " "
43	BLOCK_EXPR@[44; 46)	43	BLOCK_EXPR@44..46
44	BLOCK@[44; 46)	44	BLOCK@44..46
45	L_CURLY@[44; 45) "{"	45	L_CURLY@44..45 "{"
46	R_CURLY@[45; 46) "}"	46	R_CURLY@45..46 "}"
47	WHITESPACE@[46; 51) "\n "	47	WHITESPACE@46..51 "\n "
48	FN_DEF@[51; 69)	48	FN_DEF@51..69
49	FN_KW@[51; 53) "fn"	49	FN_KW@51..53 "fn"
50	WHITESPACE@[53; 54) " "	50	WHITESPACE@53..54 " "
51	NAME@[54; 55)	51	NAME@54..55
52	IDENT@[54; 55) "c"	52	IDENT@54..55 "c"
53	PARAM_LIST@[55; 66)	53	PARAM_LIST@55..66
54	L_PAREN@[55; 56) "("	54	L_PAREN@55..56 "("
55	SELF_PARAM@[56; 64)	55	SELF_PARAM@56..64
56	AMP@[56; 57) "&"	56	AMP@56..57 "&"
57	LIFETIME@[57; 59) "\'a"	57	LIFETIME@57..59 "\'a"
58	WHITESPACE@[59; 60) " "	58	WHITESPACE@59..60 " "
59	SELF_KW@[60; 64) "self"	59	SELF_KW@60..64 "self"
60	COMMA@[64; 65) ","	60	COMMA@64..65 ","
61	R_PAREN@[65; 66) ")"	61	R_PAREN@65..66 ")"
62	WHITESPACE@[66; 67) " "	62	WHITESPACE@66..67 " "
63	BLOCK_EXPR@[67; 69)	63	BLOCK_EXPR@67..69
64	BLOCK@[67; 69)	64	BLOCK@67..69
65	L_CURLY@[67; 68) "{"	65	L_CURLY@67..68 "{"
66	R_CURLY@[68; 69) "}"	66	R_CURLY@68..69 "}"
67	WHITESPACE@[69; 74) "\n "	67	WHITESPACE@69..74 "\n "
68	FN_DEF@[74; 103)	68	FN_DEF@74..103
69	FN_KW@[74; 76) "fn"	69	FN_KW@74..76 "fn"
70	WHITESPACE@[76; 77) " "	70	WHITESPACE@76..77 " "
71	NAME@[77; 78)	71	NAME@77..78
72	IDENT@[77; 78) "d"	72	IDENT@77..78 "d"
73	PARAM_LIST@[78; 100)	73	PARAM_LIST@78..100
74	L_PAREN@[78; 79) "("	74	L_PAREN@78..79 "("
75	SELF_PARAM@[79; 91)	75	SELF_PARAM@79..91
76	AMP@[79; 80) "&"	76	AMP@79..80 "&"
77	LIFETIME@[80; 82) "\'a"	77	LIFETIME@80..82 "\'a"
78	WHITESPACE@[82; 83) " "	78	WHITESPACE@82..83 " "
79	MUT_KW@[83; 86) "mut"	79	MUT_KW@83..86 "mut"
80	WHITESPACE@[86; 87) " "	80	WHITESPACE@86..87 " "
81	SELF_KW@[87; 91) "self"	81	SELF_KW@87..91 "self"
82	COMMA@[91; 92) ","	82	COMMA@91..92 ","
83	WHITESPACE@[92; 93) " "	83	WHITESPACE@92..93 " "
84	PARAM@[93; 99)	84	PARAM@93..99
85	BIND_PAT@[93; 94)	85	BIND_PAT@93..94
86	NAME@[93; 94)	86	NAME@93..94
87	IDENT@[93; 94) "x"	87	IDENT@93..94 "x"
88	COLON@[94; 95) ":"	88	COLON@94..95 ":"
89	WHITESPACE@[95; 96) " "	89	WHITESPACE@95..96 " "
90	PATH_TYPE@[96; 99)	90	PATH_TYPE@96..99
91	PATH@[96; 99)	91	PATH@96..99
92	PATH_SEGMENT@[96; 99)	92	PATH_SEGMENT@96..99
93	NAME_REF@[96; 99)	93	NAME_REF@96..99
94	IDENT@[96; 99) "i32"	94	IDENT@96..99 "i32"
95	R_PAREN@[99; 100) ")"	95	R_PAREN@99..100 ")"
96	WHITESPACE@[100; 101) " "	96	WHITESPACE@100..101 " "
97	BLOCK_EXPR@[101; 103)	97	BLOCK_EXPR@101..103
98	BLOCK@[101; 103)	98	BLOCK@101..103
99	L_CURLY@[101; 102) "{"	99	L_CURLY@101..102 "{"
100	R_CURLY@[102; 103) "}"	100	R_CURLY@102..103 "}"
101	WHITESPACE@[103; 108) "\n "	101	WHITESPACE@103..108 "\n "
102	FN_DEF@[108; 125)	102	FN_DEF@108..125
103	FN_KW@[108; 110) "fn"	103	FN_KW@108..110 "fn"
104	WHITESPACE@[110; 111) " "	104	WHITESPACE@110..111 " "
105	NAME@[111; 112)	105	NAME@111..112
106	IDENT@[111; 112) "e"	106	IDENT@111..112 "e"
107	PARAM_LIST@[112; 122)	107	PARAM_LIST@112..122
108	L_PAREN@[112; 113) "("	108	L_PAREN@112..113 "("
109	SELF_PARAM@[113; 121)	109	SELF_PARAM@113..121
110	MUT_KW@[113; 116) "mut"	110	MUT_KW@113..116 "mut"
111	WHITESPACE@[116; 117) " "	111	WHITESPACE@116..117 " "
112	SELF_KW@[117; 121) "self"	112	SELF_KW@117..121 "self"
113	R_PAREN@[121; 122) ")"	113	R_PAREN@121..122 ")"
114	WHITESPACE@[122; 123) " "	114	WHITESPACE@122..123 " "
115	BLOCK_EXPR@[123; 125)	115	BLOCK_EXPR@123..125
116	BLOCK@[123; 125)	116	BLOCK@123..125
117	L_CURLY@[123; 124) "{"	117	L_CURLY@123..124 "{"
118	R_CURLY@[124; 125) "}"	118	R_CURLY@124..125 "}"
119	WHITESPACE@[125; 126) "\n"	119	WHITESPACE@125..126 "\n"
120	R_CURLY@[126; 127) "}"	120	R_CURLY@126..127 "}"
121	WHITESPACE@[127; 128) "\n"	121	WHITESPACE@127..128 "\n"