Merge #5629

5629: Finalize Path grammar r=matklad a=matklad

bors r+
🤖

Co-authored-by: Aleksey Kladov <[email protected]>

27 files changed, 44 insertions, 43 deletions

diff --git a/crates/ra_syntax/test_data/parser/err/0012_broken_lambda.rast b/crates/ra_syntax/test_data/parser/err/0012_broken_lambda.rast
index 0afa24b77..307d9b31b 100644
--- a/crates/ra_syntax/test_data/parser/err/0012_broken_lambda.rast
+++ b/crates/ra_syntax/test_data/parser/err/0012_broken_lambda.rast
@@ -25,7 +25,7 @@ [email protected]
           [email protected]
             [email protected]
               [email protected] "Sink"
-            TYP[email protected]
+            GENERIC[email protected]
               [email protected]
               [email protected]
                 [email protected] "'a"
@@ -79,7 +79,7 @@ [email protected]
             [email protected]
               [email protected]
                 [email protected] "Vec"
-              TYP[email protected]
+              GENERIC[email protected]
                 [email protected]
                 [email protected]
                   [email protected]
diff --git a/crates/ra_syntax/test_data/parser/err/0013_invalid_type.rast b/crates/ra_syntax/test_data/parser/err/0013_invalid_type.rast
index 3eef848fc..f48ab6e71 100644
--- a/crates/ra_syntax/test_data/parser/err/0013_invalid_type.rast
+++ b/crates/ra_syntax/test_data/parser/err/0013_invalid_type.rast
@@ -16,7 +16,7 @@ [email protected]
             [email protected]
               [email protected]
                 [email protected] "RefCell"
-              TYP[email protected]
+              GENERIC[email protected]
                 [email protected] "<"
                 [email protected]
                   [email protected]
@@ -24,7 +24,7 @@ [email protected]
                       [email protected]
                         [email protected]
                           [email protected] "HashMap"
-                        TYP[email protected]
+                        GENERIC[email protected]
                           [email protected] "<"
                           [email protected] "\n        "
                           [email protected]
@@ -41,7 +41,7 @@ [email protected]
                                 [email protected]
                                   [email protected]
                                     [email protected] "Box"
-                                  TYP[email protected]
+                                  GENERIC[email protected]
                                     [email protected] "<"
                                     [email protected]
                                       [email protected]
diff --git a/crates/ra_syntax/test_data/parser/err/0024_many_type_parens.rast b/crates/ra_syntax/test_data/parser/err/0024_many_type_parens.rast
index 4c2d1ad68..1cb1e9757 100644
--- a/crates/ra_syntax/test_data/parser/err/0024_many_type_parens.rast
+++ b/crates/ra_syntax/test_data/parser/err/0024_many_type_parens.rast
@@ -50,7 +50,7 @@ [email protected]
                   [email protected]
                     [email protected]
                       [email protected] "Trait"
-                    TYP[email protected]
+                    GENERIC[email protected]
                       [email protected] "<"
                       [email protected]
                         [email protected] "\'a"
@@ -92,7 +92,7 @@ [email protected]
                   [email protected]
                     [email protected]
                       [email protected] "Box"
-                    TYP[email protected]
+                    GENERIC[email protected]
                       [email protected] "<"
                       [email protected]
                         [email protected]
@@ -133,7 +133,7 @@ [email protected]
                     [email protected]
                       [email protected]
                         [email protected] "Trait"
-                      TYP[email protected]
+                      GENERIC[email protected]
                         [email protected] "<"
                         [email protected]
                           [email protected] "\'a"
@@ -156,7 +156,7 @@ [email protected]
             [email protected]
               [email protected]
                 [email protected] "Box"
-              TYP[email protected]
+              GENERIC[email protected]
                 [email protected] "<"
                 [email protected]
                   [email protected]
@@ -235,7 +235,7 @@ [email protected]
                   [email protected]
                     [email protected]
                       [email protected] "Box"
-                    TYP[email protected]
+                    GENERIC[email protected]
                       [email protected] "<"
                       [email protected]
                         [email protected]
@@ -253,7 +253,7 @@ [email protected]
                                 [email protected]
                                   [email protected]
                                     [email protected] "Trait"
-                                  TYP[email protected]
+                                  GENERIC[email protected]
                                     [email protected] "<"
                                     [email protected]
                                       [email protected] "\'a"
diff --git a/crates/ra_syntax/test_data/parser/err/0026_imp_recovery.rast b/crates/ra_syntax/test_data/parser/err/0026_imp_recovery.rast
index 7e4b11c27..1b08c834e 100644
--- a/crates/ra_syntax/test_data/parser/err/0026_imp_recovery.rast
+++ b/crates/ra_syntax/test_data/parser/err/0026_imp_recovery.rast
@@ -31,7 +31,7 @@ [email protected]
         [email protected]
           [email protected]
             [email protected] "OnceCell"
-          TYP[email protected]
+          GENERIC[email protected]
             [email protected] "<"
             [email protected]
               [email protected]
diff --git a/crates/ra_syntax/test_data/parser/err/0039_lambda_recovery.rast b/crates/ra_syntax/test_data/parser/err/0039_lambda_recovery.rast
index 0678d4278..7a5e115bc 100644
--- a/crates/ra_syntax/test_data/parser/err/0039_lambda_recovery.rast
+++ b/crates/ra_syntax/test_data/parser/err/0039_lambda_recovery.rast
@@ -62,7 +62,7 @@ [email protected]
           [email protected] "."
           [email protected]
             [email protected] "max"
-          TYP[email protected]
+          GENERIC[email protected]
             [email protected] "::"
             [email protected] "<"
             [email protected]
diff --git a/crates/ra_syntax/test_data/parser/fragments/type/ok/0000_result.rast b/crates/ra_syntax/test_data/parser/fragments/type/ok/0000_result.rast
index 8831cfa6c..38c15b581 100644
--- a/crates/ra_syntax/test_data/parser/fragments/type/ok/0000_result.rast
+++ b/crates/ra_syntax/test_data/parser/fragments/type/ok/0000_result.rast
@@ -3,7 +3,7 @@ [email protected]
     [email protected]
       [email protected]
         [email protected] "Result"
-      TYP[email protected]
+      GENERIC[email protected]
         [email protected] "<"
         [email protected]
           [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0004_value_parameters_no_patterns.rast b/crates/ra_syntax/test_data/parser/inline/ok/0004_value_parameters_no_patterns.rast
index ace8ad050..44d92aedb 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0004_value_parameters_no_patterns.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0004_value_parameters_no_patterns.rast
@@ -12,7 +12,7 @@ [email protected]
         [email protected]
           [email protected]
             [email protected] "Box"
-          TYP[email protected]
+          GENERIC[email protected]
             [email protected] "<"
             [email protected]
               [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0018_arb_self_types.rast b/crates/ra_syntax/test_data/parser/inline/ok/0018_arb_self_types.rast
index 20b2b6c19..1b31aa95a 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0018_arb_self_types.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0018_arb_self_types.rast
@@ -53,7 +53,7 @@ [email protected]
                 [email protected]
                   [email protected]
                     [email protected] "Box"
-                  TYP[email protected]
+                  GENERIC[email protected]
                     [email protected] "<"
                     [email protected]
                       [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0028_impl_trait_type.rast b/crates/ra_syntax/test_data/parser/inline/ok/0028_impl_trait_type.rast
index f45f3cab8..32b2959bd 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0028_impl_trait_type.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0028_impl_trait_type.rast
@@ -17,7 +17,7 @@ [email protected]
               [email protected]
                 [email protected]
                   [email protected] "Iterator"
-                TYP[email protected]
+                GENERIC[email protected]
                   [email protected] "<"
                   [email protected]
                     [email protected]
@@ -28,7 +28,7 @@ [email protected]
                         [email protected]
                           [email protected]
                             [email protected] "Foo"
-                          TYP[email protected]
+                          GENERIC[email protected]
                             [email protected] "<"
                             [email protected]
                               [email protected] "\'a"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0039_type_arg.rast b/crates/ra_syntax/test_data/parser/inline/ok/0039_type_arg.rast
index 2185d3c91..69e98b9d6 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0039_type_arg.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0039_type_arg.rast
@@ -12,7 +12,7 @@ [email protected]
         [email protected]
           [email protected]
             [email protected] "B"
-          TYP[email protected]
+          GENERIC[email protected]
             [email protected] "<"
             [email protected]
               [email protected] "\'static"
@@ -27,7 +27,8 @@ [email protected]
             [email protected] ","
             [email protected] " "
             [email protected]
-              [email protected] "1"
+              [email protected]
+                [email protected] "1"
             [email protected] ","
             [email protected] " "
             [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0045_param_list_opt_patterns.rast b/crates/ra_syntax/test_data/parser/inline/ok/0045_param_list_opt_patterns.rast
index d4235a8b1..c100d1c71 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0045_param_list_opt_patterns.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0045_param_list_opt_patterns.rast
@@ -30,7 +30,7 @@ [email protected]
                             [email protected]
                               [email protected]
                                 [email protected] "Foo"
-                              TYP[email protected]
+                              GENERIC[email protected]
                                 [email protected] "<"
                                 [email protected]
                                   [email protected] "\'a"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0048_path_type_with_bounds.rast b/crates/ra_syntax/test_data/parser/inline/ok/0048_path_type_with_bounds.rast
index 37757ccd4..4d8404e7c 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0048_path_type_with_bounds.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0048_path_type_with_bounds.rast
@@ -16,7 +16,7 @@ [email protected]
           [email protected]
             [email protected]
               [email protected] "Box"
-            TYP[email protected]
+            GENERIC[email protected]
               [email protected] "<"
               [email protected]
                 [email protected]
@@ -55,7 +55,7 @@ [email protected]
           [email protected]
             [email protected]
               [email protected] "Box"
-            TYP[email protected]
+            GENERIC[email protected]
               [email protected] "<"
               [email protected]
                 [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0053_path_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0053_path_expr.rast
index 2bfb52453..de2016f18 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0053_path_expr.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0053_path_expr.rast
@@ -60,7 +60,7 @@ [email protected]
               [email protected] "::"
               [email protected]
                 [email protected] "a"
-              TYP[email protected]
+              GENERIC[email protected]
                 [email protected] "::"
                 [email protected] "<"
                 [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0065_dyn_trait_type.rast b/crates/ra_syntax/test_data/parser/inline/ok/0065_dyn_trait_type.rast
index 629fea99d..3a7fcfe24 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0065_dyn_trait_type.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0065_dyn_trait_type.rast
@@ -17,7 +17,7 @@ [email protected]
               [email protected]
                 [email protected]
                   [email protected] "Iterator"
-                TYP[email protected]
+                GENERIC[email protected]
                   [email protected] "<"
                   [email protected]
                     [email protected]
@@ -28,7 +28,7 @@ [email protected]
                         [email protected]
                           [email protected]
                             [email protected] "Foo"
-                          TYP[email protected]
+                          GENERIC[email protected]
                             [email protected] "<"
                             [email protected]
                               [email protected] "\'a"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0081_for_type.rast b/crates/ra_syntax/test_data/parser/inline/ok/0081_for_type.rast
index e7629ac03..5f4807522 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0081_for_type.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0081_for_type.rast
@@ -95,7 +95,7 @@ [email protected]
           [email protected]
             [email protected]
               [email protected] "PartialEq"
-            TYP[email protected]
+            GENERIC[email protected]
               [email protected] "<"
               [email protected]
                 [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0104_path_fn_trait_args.rast b/crates/ra_syntax/test_data/parser/inline/ok/0104_path_fn_trait_args.rast
index 3f53d60c0..1244a5031 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0104_path_fn_trait_args.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0104_path_fn_trait_args.rast
@@ -12,7 +12,7 @@ [email protected]
         [email protected]
           [email protected]
             [email protected] "Box"
-          TYP[email protected]
+          GENERIC[email protected]
             [email protected] "<"
             [email protected]
               [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0107_method_call_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0107_method_call_expr.rast
index b2961b0ff..be8365e05 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0107_method_call_expr.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0107_method_call_expr.rast
@@ -36,7 +36,7 @@ [email protected]
           [email protected] "."
           [email protected]
             [email protected] "bar"
-          TYP[email protected]
+          GENERIC[email protected]
             [email protected] "::"
             [email protected] "<"
             [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0138_associated_type_bounds.rast b/crates/ra_syntax/test_data/parser/inline/ok/0138_associated_type_bounds.rast
index 157513565..e0a82df75 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0138_associated_type_bounds.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0138_associated_type_bounds.rast
@@ -18,7 +18,7 @@ [email protected]
                 [email protected]
                   [email protected]
                     [email protected] "Iterator"
-                  TYP[email protected]
+                  GENERIC[email protected]
                     [email protected] "<"
                     [email protected]
                       [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0150_impl_type_params.rast b/crates/ra_syntax/test_data/parser/inline/ok/0150_impl_type_params.rast
index 8f197a19d..12194abda 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0150_impl_type_params.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0150_impl_type_params.rast
@@ -22,7 +22,7 @@ [email protected]
         [email protected]
           [email protected]
             [email protected] "Bar"
-          TYP[email protected]
+          GENERIC[email protected]
             [email protected] "<"
             [email protected]
               [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0151_trait_alias.rast b/crates/ra_syntax/test_data/parser/inline/ok/0151_trait_alias.rast
index cc220e534..dac50410e 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0151_trait_alias.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0151_trait_alias.rast
@@ -20,7 +20,7 @@ [email protected]
             [email protected]
               [email protected]
                 [email protected] "T"
-              TYP[email protected]
+              GENERIC[email protected]
                 [email protected] "<"
                 [email protected]
                   [email protected]
@@ -52,7 +52,7 @@ [email protected]
             [email protected]
               [email protected]
                 [email protected] "T"
-              TYP[email protected]
+              GENERIC[email protected]
                 [email protected] "<"
                 [email protected]
                   [email protected]
@@ -115,7 +115,7 @@ [email protected]
                 [email protected]
                   [email protected]
                     [email protected] "T"
-                  TYP[email protected]
+                  GENERIC[email protected]
                     [email protected] "<"
                     [email protected]
                       [email protected]
diff --git a/crates/ra_syntax/test_data/parser/ok/0032_where_for.rast b/crates/ra_syntax/test_data/parser/ok/0032_where_for.rast
index 10da87c71..d59548f21 100644
--- a/crates/ra_syntax/test_data/parser/ok/0032_where_for.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0032_where_for.rast
@@ -49,7 +49,7 @@ [email protected]
                   [email protected]
                     [email protected]
                       [email protected] "Deserialize"
-                    TYP[email protected]
+                    GENERIC[email protected]
                       [email protected] "<"
                       [email protected]
                         [email protected] "\'de"
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 1d75ed08f..0e0c8c9dc 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
@@ -249,7 +249,7 @@ [email protected]
                   [email protected]
                     [email protected]
                       [email protected] "Cell"
-                    TYP[email protected]
+                    GENERIC[email protected]
                       [email protected] "<"
                       [email protected]
                         [email protected]
@@ -1588,7 +1588,7 @@ [email protected]
                   [email protected]
                     [email protected]
                       [email protected] "union"
-                    TYP[email protected]
+                    GENERIC[email protected]
                       [email protected] "<"
                       [email protected]
                         [email protected] "\'union"
diff --git a/crates/ra_syntax/test_data/parser/ok/0045_block_inner_attrs.rast b/crates/ra_syntax/test_data/parser/ok/0045_block_inner_attrs.rast
index 139ce9046..bd152ffa3 100644
--- a/crates/ra_syntax/test_data/parser/ok/0045_block_inner_attrs.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0045_block_inner_attrs.rast
@@ -141,7 +141,7 @@ [email protected]
                               [email protected]
                                 [email protected]
                                   [email protected] "Event"
-                                TYP[email protected]
+                                GENERIC[email protected]
                                   [email protected] "<"
                                   [email protected]
                                     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/ok/0050_async_block_as_argument.rast b/crates/ra_syntax/test_data/parser/ok/0050_async_block_as_argument.rast
index 798e81ca6..48e1f07d1 100644
--- a/crates/ra_syntax/test_data/parser/ok/0050_async_block_as_argument.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0050_async_block_as_argument.rast
@@ -32,7 +32,7 @@ [email protected]
                   [email protected]
                     [email protected]
                       [email protected] "Future"
-                    TYP[email protected]
+                    GENERIC[email protected]
                       [email protected] "<"
                       [email protected]
                         [email protected]
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 2cc849784..706ccdc39 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
@@ -172,7 +172,7 @@ [email protected]
                             [email protected]
                               [email protected]
                                 [email protected] "Foo"
-                              TYP[email protected]
+                              GENERIC[email protected]
                                 [email protected] "<"
                                 [email protected]
                                   [email protected] "\'a"
@@ -490,7 +490,7 @@ [email protected]
                 [email protected]
                   [email protected]
                     [email protected] "Rc"
-                  TYP[email protected]
+                  GENERIC[email protected]
                     [email protected] "<"
                     [email protected]
                       [email protected]
diff --git a/crates/ra_syntax/test_data/parser/ok/0052_for_range_block.rast b/crates/ra_syntax/test_data/parser/ok/0052_for_range_block.rast
index a30000398..fd4f4f242 100644
--- a/crates/ra_syntax/test_data/parser/ok/0052_for_range_block.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0052_for_range_block.rast
@@ -50,7 +50,7 @@ [email protected]
             [email protected] "."
             [email protected]
               [email protected] "sum"
-            TYP[email protected]
+            GENERIC[email protected]
               [email protected] "::"
               [email protected] "<"
               [email protected]
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 e3997ac5b..0d48c7e81 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
@@ -16,7 +16,7 @@ [email protected]
           [email protected]
             [email protected]
               [email protected] "Foo"
-            TYP[email protected]
+            GENERIC[email protected]
               [email protected] "<"
               [email protected]
                 [email protected]