8 files changed, 38 insertions, 38 deletions
diff --git a/crates/ra_syntax/test_data/parser/ok/0031_extern.rast b/crates/ra_syntax/test_data/parser/ok/0031_extern.rast
index 79ea098a2..8150d445f 100644
--- a/crates/ra_syntax/test_data/parser/ok/0031_extern.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0031_extern.rast
@@ -99,7 +99,7 @@ SOURCE_FILE@0..1598
                IDENT@117..121 "addr"
            COLON@121..122 ":"
            WHITESPACE@122..123 " "
-            POINTER_TYPE@123..138
+            PTR_TYPE@123..138
              STAR@123..124 "*"
              CONST_KW@124..129 "const"
              WHITESPACE@129..130 " "
@@ -164,7 +164,7 @@ SOURCE_FILE@0..1598
                IDENT@204..211 "address"
            COLON@211..212 ":"
            WHITESPACE@212..213 " "
-            POINTER_TYPE@213..228
+            PTR_TYPE@213..228
              STAR@213..214 "*"
              CONST_KW@214..219 "const"
              WHITESPACE@219..220 " "
@@ -278,7 +278,7 @@ SOURCE_FILE@0..1598
                IDENT@382..389 "address"
            COLON@389..390 ":"
            WHITESPACE@390..391 " "
-            POINTER_TYPE@391..404
+            PTR_TYPE@391..404
              STAR@391..392 "*"
              MUT_KW@392..395 "mut"
              WHITESPACE@395..396 " "
@@ -295,7 +295,7 @@ SOURCE_FILE@0..1598
                IDENT@429..440 "address_len"
            COLON@440..441 ":"
            WHITESPACE@441..442 " "
-            POINTER_TYPE@442..456
+            PTR_TYPE@442..456
              STAR@442..443 "*"
              MUT_KW@443..446 "mut"
              WHITESPACE@446..447 " "
@@ -375,7 +375,7 @@ SOURCE_FILE@0..1598
                IDENT@609..615 "optval"
            COLON@615..616 ":"
            WHITESPACE@616..617 " "
-            POINTER_TYPE@617..630
+            PTR_TYPE@617..630
              STAR@617..618 "*"
              MUT_KW@618..621 "mut"
              WHITESPACE@621..622 " "
@@ -393,7 +393,7 @@ SOURCE_FILE@0..1598
                IDENT@654..660 "optlen"
            COLON@660..661 ":"
            WHITESPACE@661..662 " "
-            POINTER_TYPE@662..678
+            PTR_TYPE@662..678
              STAR@662..663 "*"
              MUT_KW@663..666 "mut"
              WHITESPACE@666..667 " "
@@ -474,7 +474,7 @@ SOURCE_FILE@0..1598
                IDENT@784..789 "value"
            COLON@789..790 ":"
            WHITESPACE@790..791 " "
-            POINTER_TYPE@791..806
+            PTR_TYPE@791..806
              STAR@791..792 "*"
              CONST_KW@792..797 "const"
              WHITESPACE@797..798 " "
@@ -540,7 +540,7 @@ SOURCE_FILE@0..1598
                IDENT@905..912 "address"
            COLON@912..913 ":"
            WHITESPACE@913..914 " "
-            POINTER_TYPE@914..927
+            PTR_TYPE@914..927
              STAR@914..915 "*"
              MUT_KW@915..918 "mut"
              WHITESPACE@918..919 " "
@@ -557,7 +557,7 @@ SOURCE_FILE@0..1598
                IDENT@952..963 "address_len"
            COLON@963..964 ":"
            WHITESPACE@964..965 " "
-            POINTER_TYPE@965..979
+            PTR_TYPE@965..979
              STAR@965..966 "*"
              MUT_KW@966..969 "mut"
              WHITESPACE@969..970 " "
@@ -609,7 +609,7 @@ SOURCE_FILE@0..1598
                IDENT@1028..1031 "buf"
            COLON@1031..1032 ":"
            WHITESPACE@1032..1033 " "
-            POINTER_TYPE@1033..1048
+            PTR_TYPE@1033..1048
              STAR@1033..1034 "*"
              CONST_KW@1034..1039 "const"
              WHITESPACE@1039..1040 " "
@@ -655,7 +655,7 @@ SOURCE_FILE@0..1598
                IDENT@1099..1103 "addr"
            COLON@1103..1104 ":"
            WHITESPACE@1104..1105 " "
-            POINTER_TYPE@1105..1120
+            PTR_TYPE@1105..1120
              STAR@1105..1106 "*"
              CONST_KW@1106..1111 "const"
              WHITESPACE@1111..1112 " "
@@ -720,7 +720,7 @@ SOURCE_FILE@0..1598
                IDENT@1207..1210 "buf"
            COLON@1210..1211 ":"
            WHITESPACE@1211..1212 " "
-            POINTER_TYPE@1212..1227
+            PTR_TYPE@1212..1227
              STAR@1212..1213 "*"
              CONST_KW@1213..1218 "const"
              WHITESPACE@1218..1219 " "
@@ -801,7 +801,7 @@ SOURCE_FILE@0..1598
                IDENT@1327..1330 "buf"
            COLON@1330..1331 ":"
            WHITESPACE@1331..1332 " "
-            POINTER_TYPE@1332..1345
+            PTR_TYPE@1332..1345
              STAR@1332..1333 "*"
              MUT_KW@1333..1336 "mut"
              WHITESPACE@1336..1337 " "
@@ -847,7 +847,7 @@ SOURCE_FILE@0..1598
                IDENT@1398..1402 "addr"
            COLON@1402..1403 ":"
            WHITESPACE@1403..1404 " "
-            POINTER_TYPE@1404..1419
+            PTR_TYPE@1404..1419
              STAR@1404..1405 "*"
              MUT_KW@1405..1408 "mut"
              WHITESPACE@1408..1409 " "
@@ -865,7 +865,7 @@ SOURCE_FILE@0..1598
                IDENT@1441..1448 "addrlen"
            COLON@1448..1449 ":"
            WHITESPACE@1449..1450 " "
-            POINTER_TYPE@1450..1466
+            PTR_TYPE@1450..1466
              STAR@1450..1451 "*"
              MUT_KW@1451..1454 "mut"
              WHITESPACE@1454..1455 " "
@@ -918,7 +918,7 @@ SOURCE_FILE@0..1598
                IDENT@1515..1518 "buf"
            COLON@1518..1519 ":"
            WHITESPACE@1519..1520 " "
-            POINTER_TYPE@1520..1533
+            PTR_TYPE@1520..1533
              STAR@1520..1521 "*"
              MUT_KW@1521..1524 "mut"
              WHITESPACE@1524..1525 " "
diff --git a/crates/ra_syntax/test_data/parser/ok/0035_weird_exprs.rast b/crates/ra_syntax/test_data/parser/ok/0035_weird_exprs.rast
index 5bb9363a8..7c61b5006 100644
--- a/crates/ra_syntax/test_data/parser/ok/0035_weird_exprs.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0035_weird_exprs.rast
@@ -242,7 +242,7 @@ SOURCE_FILE@0..3813
                IDENT@649..650 "x"
            COLON@650..651 ":"
            WHITESPACE@651..652 " "
-            REFERENCE_TYPE@652..663
+            REF_TYPE@652..663
              AMP@652..653 "&"
              PATH_TYPE@653..663
                PATH@653..663
@@ -1579,7 +1579,7 @@ SOURCE_FILE@0..3813
              IDENT@2873..2878 "union"
            COLON@2878..2879 ":"
            WHITESPACE@2879..2880 " "
-            REFERENCE_TYPE@2880..2901
+            REF_TYPE@2880..2901
              AMP@2880..2881 "&"
              LIFETIME@2881..2887 "\'union"
              WHITESPACE@2887..2888 " "
diff --git a/crates/ra_syntax/test_data/parser/ok/0051_parameter_attrs.rast b/crates/ra_syntax/test_data/parser/ok/0051_parameter_attrs.rast
index 0303b198f..d4f05f279 100644
--- a/crates/ra_syntax/test_data/parser/ok/0051_parameter_attrs.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0051_parameter_attrs.rast
@@ -96,7 +96,7 @@ SOURCE_FILE@0..519
                IDENT@87..93 "format"
            COLON@93..94 ":"
            WHITESPACE@94..95 " "
-            POINTER_TYPE@95..104
+            PTR_TYPE@95..104
              STAR@95..96 "*"
              CONST_KW@96..101 "const"
              WHITESPACE@101..102 " "
@@ -163,7 +163,7 @@ SOURCE_FILE@0..519
                      R_BRACK@152..153 "]"
                    WHITESPACE@153..154 " "
                    PARAM@154..166
-                      REFERENCE_TYPE@154..166
+                      REF_TYPE@154..166
                        AMP@154..155 "&"
                        MUT_KW@155..158 "mut"
                        WHITESPACE@158..159 " "
diff --git a/crates/ra_syntax/test_data/parser/ok/0054_qual_path_in_type_arg.rast b/crates/ra_syntax/test_data/parser/ok/0054_qual_path_in_type_arg.rast
index f71ceecd7..f25c9ac36 100644
--- a/crates/ra_syntax/test_data/parser/ok/0054_qual_path_in_type_arg.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0054_qual_path_in_type_arg.rast
@@ -102,7 +102,7 @@ SOURCE_FILE@0..88
                    PARAM_LIST@76..83
                      L_PAREN@76..77 "("
                      PARAM@77..82
-                        REFERENCE_TYPE@77..82
+                        REF_TYPE@77..82
                          AMP@77..78 "&"
                          PATH_TYPE@78..82
                            PATH@78..82
diff --git a/crates/ra_syntax/test_data/parser/ok/0063_trait_fn_patterns.rast b/crates/ra_syntax/test_data/parser/ok/0063_trait_fn_patterns.rast
index 42680b283..8eda59976 100644
--- a/crates/ra_syntax/test_data/parser/ok/0063_trait_fn_patterns.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0063_trait_fn_patterns.rast
@@ -140,9 +140,9 @@ SOURCE_FILE@0..170
                    IDENT@121..122 "a"
            COLON@122..123 ":"
            WHITESPACE@123..124 " "
-            REFERENCE_TYPE@124..131
+            REF_TYPE@124..131
              AMP@124..125 "&"
-              REFERENCE_TYPE@125..131
+              REF_TYPE@125..131
                AMP@125..126 "&"
                PATH_TYPE@126..131
                  PATH@126..131
diff --git a/crates/ra_syntax/test_data/parser/ok/0063_variadic_fun.rast b/crates/ra_syntax/test_data/parser/ok/0063_variadic_fun.rast
index a132591f0..4009b3ff8 100644
--- a/crates/ra_syntax/test_data/parser/ok/0063_variadic_fun.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0063_variadic_fun.rast
@@ -20,7 +20,7 @@ SOURCE_FILE@0..126
              UNDERSCORE@22..23 "_"
            COLON@23..24 ":"
            WHITESPACE@24..25 " "
-            POINTER_TYPE@25..32
+            PTR_TYPE@25..32
              STAR@25..26 "*"
              MUT_KW@26..29 "mut"
              WHITESPACE@29..30 " "
@@ -49,7 +49,7 @@ SOURCE_FILE@0..126
              UNDERSCORE@50..51 "_"
            COLON@51..52 ":"
            WHITESPACE@52..53 " "
-            POINTER_TYPE@53..60
+            PTR_TYPE@53..60
              STAR@53..54 "*"
              MUT_KW@54..57 "mut"
              WHITESPACE@57..58 " "
@@ -81,7 +81,7 @@ SOURCE_FILE@0..126
              UNDERSCORE@80..81 "_"
            COLON@81..82 ":"
            WHITESPACE@82..83 " "
-            POINTER_TYPE@83..90
+            PTR_TYPE@83..90
              STAR@83..84 "*"
              MUT_KW@84..87 "mut"
              WHITESPACE@87..88 " "
diff --git a/crates/ra_syntax/test_data/parser/ok/0064_impl_fn_params.rast b/crates/ra_syntax/test_data/parser/ok/0064_impl_fn_params.rast
index 94260db7c..a3c6ed82e 100644
--- a/crates/ra_syntax/test_data/parser/ok/0064_impl_fn_params.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0064_impl_fn_params.rast
@@ -143,9 +143,9 @@ SOURCE_FILE@0..137
                    IDENT@120..121 "a"
            COLON@121..122 ":"
            WHITESPACE@122..123 " "
-            REFERENCE_TYPE@123..130
+            REF_TYPE@123..130
              AMP@123..124 "&"
-              REFERENCE_TYPE@124..130
+              REF_TYPE@124..130
                AMP@124..125 "&"
                PATH_TYPE@125..130
                  PATH@125..130
diff --git a/crates/ra_syntax/test_data/parser/ok/0067_where_for_pred.rast b/crates/ra_syntax/test_data/parser/ok/0067_where_for_pred.rast
index fae9467fc..8f8639a37 100644
--- a/crates/ra_syntax/test_data/parser/ok/0067_where_for_pred.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0067_where_for_pred.rast
@@ -42,7 +42,7 @@ SOURCE_FILE@0..374
                  PARAM_LIST@41..50
                    L_PAREN@41..42 "("
                    PARAM@42..49
-                      REFERENCE_TYPE@42..49
+                      REF_TYPE@42..49
                        AMP@42..43 "&"
                        LIFETIME@43..45 "\'a"
                        WHITESPACE@45..46 " "
@@ -85,7 +85,7 @@ SOURCE_FILE@0..374
            LIFETIME@86..88 "\'a"
          R_ANGLE@88..89 ">"
        WHITESPACE@89..90 " "
-        REFERENCE_TYPE@90..95
+        REF_TYPE@90..95
          AMP@90..91 "&"
          LIFETIME@91..93 "\'a"
          WHITESPACE@93..94 " "
@@ -138,7 +138,7 @@ SOURCE_FILE@0..374
        WHITESPACE@144..145 " "
        PAREN_TYPE@145..152
          L_PAREN@145..146 "("
-          REFERENCE_TYPE@146..151
+          REF_TYPE@146..151
            AMP@146..147 "&"
            LIFETIME@147..149 "\'a"
            WHITESPACE@149..150 " "
@@ -160,7 +160,7 @@ SOURCE_FILE@0..374
                  PARAM_LIST@156..165
                    L_PAREN@156..157 "("
                    PARAM@157..164
-                      REFERENCE_TYPE@157..164
+                      REF_TYPE@157..164
                        AMP@157..158 "&"
                        LIFETIME@158..160 "\'a"
                        WHITESPACE@160..161 " "
@@ -205,7 +205,7 @@ SOURCE_FILE@0..374
        WHITESPACE@206..207 " "
        SLICE_TYPE@207..214
          L_BRACK@207..208 "["
-          REFERENCE_TYPE@208..213
+          REF_TYPE@208..213
            AMP@208..209 "&"
            LIFETIME@209..211 "\'a"
            WHITESPACE@211..212 " "
@@ -250,7 +250,7 @@ SOURCE_FILE@0..374
            IDENT@240..242 "_t"
        COLON@242..243 ":"
        WHITESPACE@243..244 " "
-        REFERENCE_TYPE@244..246
+        REF_TYPE@244..246
          AMP@244..245 "&"
          PATH_TYPE@245..246
            PATH@245..246
@@ -275,7 +275,7 @@ SOURCE_FILE@0..374
            PATH@266..280
              PATH_SEGMENT@266..280
                L_ANGLE@266..267 "<"
-                REFERENCE_TYPE@267..272
+                REF_TYPE@267..272
                  AMP@267..268 "&"
                  LIFETIME@268..270 "\'a"
                  WHITESPACE@270..271 " "
@@ -347,12 +347,12 @@ SOURCE_FILE@0..374
              LIFETIME@342..344 "\'b"
            R_ANGLE@344..345 ">"
          WHITESPACE@345..346 " "
-          FN_POINTER_TYPE@346..362
+          FN_PTR_TYPE@346..362
            FN_KW@346..348 "fn"
            PARAM_LIST@348..362
              L_PAREN@348..349 "("
              PARAM@349..354
-                REFERENCE_TYPE@349..354
+                REF_TYPE@349..354
                  AMP@349..350 "&"
                  LIFETIME@350..352 "\'a"
                  WHITESPACE@352..353 " "
@@ -364,7 +364,7 @@ SOURCE_FILE@0..374
              COMMA@354..355 ","
              WHITESPACE@355..356 " "
              PARAM@356..361
-                REFERENCE_TYPE@356..361
+                REF_TYPE@356..361
                  AMP@356..357 "&"
                  LIFETIME@357..359 "\'b"
                  WHITESPACE@359..360 " "

diff --git a/crates/ra_syntax/test_data/parser/ok/0031_extern.rast b/crates/ra_syntax/test_data/parser/ok/0031_extern.rast index 79ea098a2..8150d445f 100644 --- a/crates/ra_syntax/test_data/parser/ok/0031_extern.rast +++ b/crates/ra_syntax/test_data/parser/ok/0031_extern.rast
@@ -99,7 +99,7 @@ SOURCE_FILE@0..1598
99	IDENT@117..121 "addr"	99	IDENT@117..121 "addr"
100	COLON@121..122 ":"	100	COLON@121..122 ":"
101	WHITESPACE@122..123 " "	101	WHITESPACE@122..123 " "
102	POINTER_TYPE@123..138	102	PTR_TYPE@123..138
103	STAR@123..124 "*"	103	STAR@123..124 "*"
104	CONST_KW@124..129 "const"	104	CONST_KW@124..129 "const"
105	WHITESPACE@129..130 " "	105	WHITESPACE@129..130 " "
@@ -164,7 +164,7 @@ SOURCE_FILE@0..1598
164	IDENT@204..211 "address"	164	IDENT@204..211 "address"
165	COLON@211..212 ":"	165	COLON@211..212 ":"
166	WHITESPACE@212..213 " "	166	WHITESPACE@212..213 " "
167	POINTER_TYPE@213..228	167	PTR_TYPE@213..228
168	STAR@213..214 "*"	168	STAR@213..214 "*"
169	CONST_KW@214..219 "const"	169	CONST_KW@214..219 "const"
170	WHITESPACE@219..220 " "	170	WHITESPACE@219..220 " "
@@ -278,7 +278,7 @@ SOURCE_FILE@0..1598
278	IDENT@382..389 "address"	278	IDENT@382..389 "address"
279	COLON@389..390 ":"	279	COLON@389..390 ":"
280	WHITESPACE@390..391 " "	280	WHITESPACE@390..391 " "
281	POINTER_TYPE@391..404	281	PTR_TYPE@391..404
282	STAR@391..392 "*"	282	STAR@391..392 "*"
283	MUT_KW@392..395 "mut"	283	MUT_KW@392..395 "mut"
284	WHITESPACE@395..396 " "	284	WHITESPACE@395..396 " "
@@ -295,7 +295,7 @@ SOURCE_FILE@0..1598
295	IDENT@429..440 "address_len"	295	IDENT@429..440 "address_len"
296	COLON@440..441 ":"	296	COLON@440..441 ":"
297	WHITESPACE@441..442 " "	297	WHITESPACE@441..442 " "
298	POINTER_TYPE@442..456	298	PTR_TYPE@442..456
299	STAR@442..443 "*"	299	STAR@442..443 "*"
300	MUT_KW@443..446 "mut"	300	MUT_KW@443..446 "mut"
301	WHITESPACE@446..447 " "	301	WHITESPACE@446..447 " "
@@ -375,7 +375,7 @@ SOURCE_FILE@0..1598
375	IDENT@609..615 "optval"	375	IDENT@609..615 "optval"
376	COLON@615..616 ":"	376	COLON@615..616 ":"
377	WHITESPACE@616..617 " "	377	WHITESPACE@616..617 " "
378	POINTER_TYPE@617..630	378	PTR_TYPE@617..630
379	STAR@617..618 "*"	379	STAR@617..618 "*"
380	MUT_KW@618..621 "mut"	380	MUT_KW@618..621 "mut"
381	WHITESPACE@621..622 " "	381	WHITESPACE@621..622 " "
@@ -393,7 +393,7 @@ SOURCE_FILE@0..1598
393	IDENT@654..660 "optlen"	393	IDENT@654..660 "optlen"
394	COLON@660..661 ":"	394	COLON@660..661 ":"
395	WHITESPACE@661..662 " "	395	WHITESPACE@661..662 " "
396	POINTER_TYPE@662..678	396	PTR_TYPE@662..678
397	STAR@662..663 "*"	397	STAR@662..663 "*"
398	MUT_KW@663..666 "mut"	398	MUT_KW@663..666 "mut"
399	WHITESPACE@666..667 " "	399	WHITESPACE@666..667 " "
@@ -474,7 +474,7 @@ SOURCE_FILE@0..1598
474	IDENT@784..789 "value"	474	IDENT@784..789 "value"
475	COLON@789..790 ":"	475	COLON@789..790 ":"
476	WHITESPACE@790..791 " "	476	WHITESPACE@790..791 " "
477	POINTER_TYPE@791..806	477	PTR_TYPE@791..806
478	STAR@791..792 "*"	478	STAR@791..792 "*"
479	CONST_KW@792..797 "const"	479	CONST_KW@792..797 "const"
480	WHITESPACE@797..798 " "	480	WHITESPACE@797..798 " "
@@ -540,7 +540,7 @@ SOURCE_FILE@0..1598
540	IDENT@905..912 "address"	540	IDENT@905..912 "address"
541	COLON@912..913 ":"	541	COLON@912..913 ":"
542	WHITESPACE@913..914 " "	542	WHITESPACE@913..914 " "
543	POINTER_TYPE@914..927	543	PTR_TYPE@914..927
544	STAR@914..915 "*"	544	STAR@914..915 "*"
545	MUT_KW@915..918 "mut"	545	MUT_KW@915..918 "mut"
546	WHITESPACE@918..919 " "	546	WHITESPACE@918..919 " "
@@ -557,7 +557,7 @@ SOURCE_FILE@0..1598
557	IDENT@952..963 "address_len"	557	IDENT@952..963 "address_len"
558	COLON@963..964 ":"	558	COLON@963..964 ":"
559	WHITESPACE@964..965 " "	559	WHITESPACE@964..965 " "
560	POINTER_TYPE@965..979	560	PTR_TYPE@965..979
561	STAR@965..966 "*"	561	STAR@965..966 "*"
562	MUT_KW@966..969 "mut"	562	MUT_KW@966..969 "mut"
563	WHITESPACE@969..970 " "	563	WHITESPACE@969..970 " "
@@ -609,7 +609,7 @@ SOURCE_FILE@0..1598
609	IDENT@1028..1031 "buf"	609	IDENT@1028..1031 "buf"
610	COLON@1031..1032 ":"	610	COLON@1031..1032 ":"
611	WHITESPACE@1032..1033 " "	611	WHITESPACE@1032..1033 " "
612	POINTER_TYPE@1033..1048	612	PTR_TYPE@1033..1048
613	STAR@1033..1034 "*"	613	STAR@1033..1034 "*"
614	CONST_KW@1034..1039 "const"	614	CONST_KW@1034..1039 "const"
615	WHITESPACE@1039..1040 " "	615	WHITESPACE@1039..1040 " "
@@ -655,7 +655,7 @@ SOURCE_FILE@0..1598
655	IDENT@1099..1103 "addr"	655	IDENT@1099..1103 "addr"
656	COLON@1103..1104 ":"	656	COLON@1103..1104 ":"
657	WHITESPACE@1104..1105 " "	657	WHITESPACE@1104..1105 " "
658	POINTER_TYPE@1105..1120	658	PTR_TYPE@1105..1120
659	STAR@1105..1106 "*"	659	STAR@1105..1106 "*"
660	CONST_KW@1106..1111 "const"	660	CONST_KW@1106..1111 "const"
661	WHITESPACE@1111..1112 " "	661	WHITESPACE@1111..1112 " "
@@ -720,7 +720,7 @@ SOURCE_FILE@0..1598
720	IDENT@1207..1210 "buf"	720	IDENT@1207..1210 "buf"
721	COLON@1210..1211 ":"	721	COLON@1210..1211 ":"
722	WHITESPACE@1211..1212 " "	722	WHITESPACE@1211..1212 " "
723	POINTER_TYPE@1212..1227	723	PTR_TYPE@1212..1227
724	STAR@1212..1213 "*"	724	STAR@1212..1213 "*"
725	CONST_KW@1213..1218 "const"	725	CONST_KW@1213..1218 "const"
726	WHITESPACE@1218..1219 " "	726	WHITESPACE@1218..1219 " "
@@ -801,7 +801,7 @@ SOURCE_FILE@0..1598
801	IDENT@1327..1330 "buf"	801	IDENT@1327..1330 "buf"
802	COLON@1330..1331 ":"	802	COLON@1330..1331 ":"
803	WHITESPACE@1331..1332 " "	803	WHITESPACE@1331..1332 " "
804	POINTER_TYPE@1332..1345	804	PTR_TYPE@1332..1345
805	STAR@1332..1333 "*"	805	STAR@1332..1333 "*"
806	MUT_KW@1333..1336 "mut"	806	MUT_KW@1333..1336 "mut"
807	WHITESPACE@1336..1337 " "	807	WHITESPACE@1336..1337 " "
@@ -847,7 +847,7 @@ SOURCE_FILE@0..1598
847	IDENT@1398..1402 "addr"	847	IDENT@1398..1402 "addr"
848	COLON@1402..1403 ":"	848	COLON@1402..1403 ":"
849	WHITESPACE@1403..1404 " "	849	WHITESPACE@1403..1404 " "
850	POINTER_TYPE@1404..1419	850	PTR_TYPE@1404..1419
851	STAR@1404..1405 "*"	851	STAR@1404..1405 "*"
852	MUT_KW@1405..1408 "mut"	852	MUT_KW@1405..1408 "mut"
853	WHITESPACE@1408..1409 " "	853	WHITESPACE@1408..1409 " "
@@ -865,7 +865,7 @@ SOURCE_FILE@0..1598
865	IDENT@1441..1448 "addrlen"	865	IDENT@1441..1448 "addrlen"
866	COLON@1448..1449 ":"	866	COLON@1448..1449 ":"
867	WHITESPACE@1449..1450 " "	867	WHITESPACE@1449..1450 " "
868	POINTER_TYPE@1450..1466	868	PTR_TYPE@1450..1466
869	STAR@1450..1451 "*"	869	STAR@1450..1451 "*"
870	MUT_KW@1451..1454 "mut"	870	MUT_KW@1451..1454 "mut"
871	WHITESPACE@1454..1455 " "	871	WHITESPACE@1454..1455 " "
@@ -918,7 +918,7 @@ SOURCE_FILE@0..1598
918	IDENT@1515..1518 "buf"	918	IDENT@1515..1518 "buf"
919	COLON@1518..1519 ":"	919	COLON@1518..1519 ":"
920	WHITESPACE@1519..1520 " "	920	WHITESPACE@1519..1520 " "
921	POINTER_TYPE@1520..1533	921	PTR_TYPE@1520..1533
922	STAR@1520..1521 "*"	922	STAR@1520..1521 "*"
923	MUT_KW@1521..1524 "mut"	923	MUT_KW@1521..1524 "mut"
924	WHITESPACE@1524..1525 " "	924	WHITESPACE@1524..1525 " "


diff --git a/crates/ra_syntax/test_data/parser/ok/0035_weird_exprs.rast b/crates/ra_syntax/test_data/parser/ok/0035_weird_exprs.rast index 5bb9363a8..7c61b5006 100644 --- a/crates/ra_syntax/test_data/parser/ok/0035_weird_exprs.rast +++ b/crates/ra_syntax/test_data/parser/ok/0035_weird_exprs.rast
@@ -242,7 +242,7 @@ SOURCE_FILE@0..3813
242	IDENT@649..650 "x"	242	IDENT@649..650 "x"
243	COLON@650..651 ":"	243	COLON@650..651 ":"
244	WHITESPACE@651..652 " "	244	WHITESPACE@651..652 " "
245	REFERENCE_TYPE@652..663	245	REF_TYPE@652..663
246	AMP@652..653 "&"	246	AMP@652..653 "&"
247	PATH_TYPE@653..663	247	PATH_TYPE@653..663
248	PATH@653..663	248	PATH@653..663
@@ -1579,7 +1579,7 @@ SOURCE_FILE@0..3813
1579	IDENT@2873..2878 "union"	1579	IDENT@2873..2878 "union"
1580	COLON@2878..2879 ":"	1580	COLON@2878..2879 ":"
1581	WHITESPACE@2879..2880 " "	1581	WHITESPACE@2879..2880 " "
1582	REFERENCE_TYPE@2880..2901	1582	REF_TYPE@2880..2901
1583	AMP@2880..2881 "&"	1583	AMP@2880..2881 "&"
1584	LIFETIME@2881..2887 "\'union"	1584	LIFETIME@2881..2887 "\'union"
1585	WHITESPACE@2887..2888 " "	1585	WHITESPACE@2887..2888 " "


diff --git a/crates/ra_syntax/test_data/parser/ok/0051_parameter_attrs.rast b/crates/ra_syntax/test_data/parser/ok/0051_parameter_attrs.rast index 0303b198f..d4f05f279 100644 --- a/crates/ra_syntax/test_data/parser/ok/0051_parameter_attrs.rast +++ b/crates/ra_syntax/test_data/parser/ok/0051_parameter_attrs.rast
@@ -96,7 +96,7 @@ SOURCE_FILE@0..519
96	IDENT@87..93 "format"	96	IDENT@87..93 "format"
97	COLON@93..94 ":"	97	COLON@93..94 ":"
98	WHITESPACE@94..95 " "	98	WHITESPACE@94..95 " "
99	POINTER_TYPE@95..104	99	PTR_TYPE@95..104
100	STAR@95..96 "*"	100	STAR@95..96 "*"
101	CONST_KW@96..101 "const"	101	CONST_KW@96..101 "const"
102	WHITESPACE@101..102 " "	102	WHITESPACE@101..102 " "
@@ -163,7 +163,7 @@ SOURCE_FILE@0..519
163	R_BRACK@152..153 "]"	163	R_BRACK@152..153 "]"
164	WHITESPACE@153..154 " "	164	WHITESPACE@153..154 " "
165	PARAM@154..166	165	PARAM@154..166
166	REFERENCE_TYPE@154..166	166	REF_TYPE@154..166
167	AMP@154..155 "&"	167	AMP@154..155 "&"
168	MUT_KW@155..158 "mut"	168	MUT_KW@155..158 "mut"
169	WHITESPACE@158..159 " "	169	WHITESPACE@158..159 " "


diff --git a/crates/ra_syntax/test_data/parser/ok/0054_qual_path_in_type_arg.rast b/crates/ra_syntax/test_data/parser/ok/0054_qual_path_in_type_arg.rast index f71ceecd7..f25c9ac36 100644 --- a/crates/ra_syntax/test_data/parser/ok/0054_qual_path_in_type_arg.rast +++ b/crates/ra_syntax/test_data/parser/ok/0054_qual_path_in_type_arg.rast
@@ -102,7 +102,7 @@ SOURCE_FILE@0..88
102	PARAM_LIST@76..83	102	PARAM_LIST@76..83
103	L_PAREN@76..77 "("	103	L_PAREN@76..77 "("
104	PARAM@77..82	104	PARAM@77..82
105	REFERENCE_TYPE@77..82	105	REF_TYPE@77..82
106	AMP@77..78 "&"	106	AMP@77..78 "&"
107	PATH_TYPE@78..82	107	PATH_TYPE@78..82
108	PATH@78..82	108	PATH@78..82


diff --git a/crates/ra_syntax/test_data/parser/ok/0063_trait_fn_patterns.rast b/crates/ra_syntax/test_data/parser/ok/0063_trait_fn_patterns.rast index 42680b283..8eda59976 100644 --- a/crates/ra_syntax/test_data/parser/ok/0063_trait_fn_patterns.rast +++ b/crates/ra_syntax/test_data/parser/ok/0063_trait_fn_patterns.rast
@@ -140,9 +140,9 @@ SOURCE_FILE@0..170
140	IDENT@121..122 "a"	140	IDENT@121..122 "a"
141	COLON@122..123 ":"	141	COLON@122..123 ":"
142	WHITESPACE@123..124 " "	142	WHITESPACE@123..124 " "
143	REFERENCE_TYPE@124..131	143	REF_TYPE@124..131
144	AMP@124..125 "&"	144	AMP@124..125 "&"
145	REFERENCE_TYPE@125..131	145	REF_TYPE@125..131
146	AMP@125..126 "&"	146	AMP@125..126 "&"
147	PATH_TYPE@126..131	147	PATH_TYPE@126..131
148	PATH@126..131	148	PATH@126..131


diff --git a/crates/ra_syntax/test_data/parser/ok/0063_variadic_fun.rast b/crates/ra_syntax/test_data/parser/ok/0063_variadic_fun.rast index a132591f0..4009b3ff8 100644 --- a/crates/ra_syntax/test_data/parser/ok/0063_variadic_fun.rast +++ b/crates/ra_syntax/test_data/parser/ok/0063_variadic_fun.rast
@@ -20,7 +20,7 @@ SOURCE_FILE@0..126
20	UNDERSCORE@22..23 "_"	20	UNDERSCORE@22..23 "_"
21	COLON@23..24 ":"	21	COLON@23..24 ":"
22	WHITESPACE@24..25 " "	22	WHITESPACE@24..25 " "
23	POINTER_TYPE@25..32	23	PTR_TYPE@25..32
24	STAR@25..26 "*"	24	STAR@25..26 "*"
25	MUT_KW@26..29 "mut"	25	MUT_KW@26..29 "mut"
26	WHITESPACE@29..30 " "	26	WHITESPACE@29..30 " "
@@ -49,7 +49,7 @@ SOURCE_FILE@0..126
49	UNDERSCORE@50..51 "_"	49	UNDERSCORE@50..51 "_"
50	COLON@51..52 ":"	50	COLON@51..52 ":"
51	WHITESPACE@52..53 " "	51	WHITESPACE@52..53 " "
52	POINTER_TYPE@53..60	52	PTR_TYPE@53..60
53	STAR@53..54 "*"	53	STAR@53..54 "*"
54	MUT_KW@54..57 "mut"	54	MUT_KW@54..57 "mut"
55	WHITESPACE@57..58 " "	55	WHITESPACE@57..58 " "
@@ -81,7 +81,7 @@ SOURCE_FILE@0..126
81	UNDERSCORE@80..81 "_"	81	UNDERSCORE@80..81 "_"
82	COLON@81..82 ":"	82	COLON@81..82 ":"
83	WHITESPACE@82..83 " "	83	WHITESPACE@82..83 " "
84	POINTER_TYPE@83..90	84	PTR_TYPE@83..90
85	STAR@83..84 "*"	85	STAR@83..84 "*"
86	MUT_KW@84..87 "mut"	86	MUT_KW@84..87 "mut"
87	WHITESPACE@87..88 " "	87	WHITESPACE@87..88 " "


diff --git a/crates/ra_syntax/test_data/parser/ok/0064_impl_fn_params.rast b/crates/ra_syntax/test_data/parser/ok/0064_impl_fn_params.rast index 94260db7c..a3c6ed82e 100644 --- a/crates/ra_syntax/test_data/parser/ok/0064_impl_fn_params.rast +++ b/crates/ra_syntax/test_data/parser/ok/0064_impl_fn_params.rast
@@ -143,9 +143,9 @@ SOURCE_FILE@0..137
143	IDENT@120..121 "a"	143	IDENT@120..121 "a"
144	COLON@121..122 ":"	144	COLON@121..122 ":"
145	WHITESPACE@122..123 " "	145	WHITESPACE@122..123 " "
146	REFERENCE_TYPE@123..130	146	REF_TYPE@123..130
147	AMP@123..124 "&"	147	AMP@123..124 "&"
148	REFERENCE_TYPE@124..130	148	REF_TYPE@124..130
149	AMP@124..125 "&"	149	AMP@124..125 "&"
150	PATH_TYPE@125..130	150	PATH_TYPE@125..130
151	PATH@125..130	151	PATH@125..130


diff --git a/crates/ra_syntax/test_data/parser/ok/0067_where_for_pred.rast b/crates/ra_syntax/test_data/parser/ok/0067_where_for_pred.rast index fae9467fc..8f8639a37 100644 --- a/crates/ra_syntax/test_data/parser/ok/0067_where_for_pred.rast +++ b/crates/ra_syntax/test_data/parser/ok/0067_where_for_pred.rast
@@ -42,7 +42,7 @@ SOURCE_FILE@0..374
42	PARAM_LIST@41..50	42	PARAM_LIST@41..50
43	L_PAREN@41..42 "("	43	L_PAREN@41..42 "("
44	PARAM@42..49	44	PARAM@42..49
45	REFERENCE_TYPE@42..49	45	REF_TYPE@42..49
46	AMP@42..43 "&"	46	AMP@42..43 "&"
47	LIFETIME@43..45 "\'a"	47	LIFETIME@43..45 "\'a"
48	WHITESPACE@45..46 " "	48	WHITESPACE@45..46 " "
@@ -85,7 +85,7 @@ SOURCE_FILE@0..374
85	LIFETIME@86..88 "\'a"	85	LIFETIME@86..88 "\'a"
86	R_ANGLE@88..89 ">"	86	R_ANGLE@88..89 ">"
87	WHITESPACE@89..90 " "	87	WHITESPACE@89..90 " "
88	REFERENCE_TYPE@90..95	88	REF_TYPE@90..95
89	AMP@90..91 "&"	89	AMP@90..91 "&"
90	LIFETIME@91..93 "\'a"	90	LIFETIME@91..93 "\'a"
91	WHITESPACE@93..94 " "	91	WHITESPACE@93..94 " "
@@ -138,7 +138,7 @@ SOURCE_FILE@0..374
138	WHITESPACE@144..145 " "	138	WHITESPACE@144..145 " "
139	PAREN_TYPE@145..152	139	PAREN_TYPE@145..152
140	L_PAREN@145..146 "("	140	L_PAREN@145..146 "("
141	REFERENCE_TYPE@146..151	141	REF_TYPE@146..151
142	AMP@146..147 "&"	142	AMP@146..147 "&"
143	LIFETIME@147..149 "\'a"	143	LIFETIME@147..149 "\'a"
144	WHITESPACE@149..150 " "	144	WHITESPACE@149..150 " "
@@ -160,7 +160,7 @@ SOURCE_FILE@0..374
160	PARAM_LIST@156..165	160	PARAM_LIST@156..165
161	L_PAREN@156..157 "("	161	L_PAREN@156..157 "("
162	PARAM@157..164	162	PARAM@157..164
163	REFERENCE_TYPE@157..164	163	REF_TYPE@157..164
164	AMP@157..158 "&"	164	AMP@157..158 "&"
165	LIFETIME@158..160 "\'a"	165	LIFETIME@158..160 "\'a"
166	WHITESPACE@160..161 " "	166	WHITESPACE@160..161 " "
@@ -205,7 +205,7 @@ SOURCE_FILE@0..374
205	WHITESPACE@206..207 " "	205	WHITESPACE@206..207 " "
206	SLICE_TYPE@207..214	206	SLICE_TYPE@207..214
207	L_BRACK@207..208 "["	207	L_BRACK@207..208 "["
208	REFERENCE_TYPE@208..213	208	REF_TYPE@208..213
209	AMP@208..209 "&"	209	AMP@208..209 "&"
210	LIFETIME@209..211 "\'a"	210	LIFETIME@209..211 "\'a"
211	WHITESPACE@211..212 " "	211	WHITESPACE@211..212 " "
@@ -250,7 +250,7 @@ SOURCE_FILE@0..374
250	IDENT@240..242 "_t"	250	IDENT@240..242 "_t"
251	COLON@242..243 ":"	251	COLON@242..243 ":"
252	WHITESPACE@243..244 " "	252	WHITESPACE@243..244 " "
253	REFERENCE_TYPE@244..246	253	REF_TYPE@244..246
254	AMP@244..245 "&"	254	AMP@244..245 "&"
255	PATH_TYPE@245..246	255	PATH_TYPE@245..246
256	PATH@245..246	256	PATH@245..246
@@ -275,7 +275,7 @@ SOURCE_FILE@0..374
275	PATH@266..280	275	PATH@266..280
276	PATH_SEGMENT@266..280	276	PATH_SEGMENT@266..280
277	L_ANGLE@266..267 "<"	277	L_ANGLE@266..267 "<"
278	REFERENCE_TYPE@267..272	278	REF_TYPE@267..272
279	AMP@267..268 "&"	279	AMP@267..268 "&"
280	LIFETIME@268..270 "\'a"	280	LIFETIME@268..270 "\'a"
281	WHITESPACE@270..271 " "	281	WHITESPACE@270..271 " "
@@ -347,12 +347,12 @@ SOURCE_FILE@0..374
347	LIFETIME@342..344 "\'b"	347	LIFETIME@342..344 "\'b"
348	R_ANGLE@344..345 ">"	348	R_ANGLE@344..345 ">"
349	WHITESPACE@345..346 " "	349	WHITESPACE@345..346 " "
350	FN_POINTER_TYPE@346..362	350	FN_PTR_TYPE@346..362
351	FN_KW@346..348 "fn"	351	FN_KW@346..348 "fn"
352	PARAM_LIST@348..362	352	PARAM_LIST@348..362
353	L_PAREN@348..349 "("	353	L_PAREN@348..349 "("
354	PARAM@349..354	354	PARAM@349..354
355	REFERENCE_TYPE@349..354	355	REF_TYPE@349..354
356	AMP@349..350 "&"	356	AMP@349..350 "&"
357	LIFETIME@350..352 "\'a"	357	LIFETIME@350..352 "\'a"
358	WHITESPACE@352..353 " "	358	WHITESPACE@352..353 " "
@@ -364,7 +364,7 @@ SOURCE_FILE@0..374
364	COMMA@354..355 ","	364	COMMA@354..355 ","
365	WHITESPACE@355..356 " "	365	WHITESPACE@355..356 " "
366	PARAM@356..361	366	PARAM@356..361
367	REFERENCE_TYPE@356..361	367	REF_TYPE@356..361
368	AMP@356..357 "&"	368	AMP@356..357 "&"
369	LIFETIME@357..359 "\'b"	369	LIFETIME@357..359 "\'b"
370	WHITESPACE@359..360 " "	370	WHITESPACE@359..360 " "