Handle self/super/crate in PathSegment as NameRef

17 files changed, 64 insertions, 32 deletions

diff --git a/crates/syntax/test_data/parser/err/0018_incomplete_fn.rast b/crates/syntax/test_data/parser/err/0018_incomplete_fn.rast
index 72939fc98..060f47dc4 100644
--- a/crates/syntax/test_data/parser/err/0018_incomplete_fn.rast
+++ b/crates/syntax/test_data/parser/err/0018_incomplete_fn.rast
@@ -49,7 +49,8 @@ [email protected]
                 [email protected]
                   [email protected]
                     [email protected]
-                      [email protected] "self"
+                      [email protected]
+                        [email protected] "self"
                 [email protected] "."
                 [email protected]
                   [email protected] "scopes"
@@ -66,7 +67,8 @@ [email protected]
               [email protected]
                 [email protected]
                   [email protected]
-                    [email protected] "self"
+                    [email protected]
+                      [email protected] "self"
               [email protected] "."
               [email protected]
                 [email protected] "scopes"
diff --git a/crates/syntax/test_data/parser/err/0035_use_recover.rast b/crates/syntax/test_data/parser/err/0035_use_recover.rast
index 2f03709eb..a95151bc5 100644
--- a/crates/syntax/test_data/parser/err/0035_use_recover.rast
+++ b/crates/syntax/test_data/parser/err/0035_use_recover.rast
@@ -24,7 +24,8 @@ [email protected]
       [email protected]
         [email protected]
           [email protected]
-            [email protected] "crate"
+            [email protected]
+              [email protected] "crate"
         [email protected] "::"
         [email protected]
           [email protected]
diff --git a/crates/syntax/test_data/parser/err/0040_illegal_crate_kw_location.rast b/crates/syntax/test_data/parser/err/0040_illegal_crate_kw_location.rast
index 284c8715b..7449b5ddf 100644
--- a/crates/syntax/test_data/parser/err/0040_illegal_crate_kw_location.rast
+++ b/crates/syntax/test_data/parser/err/0040_illegal_crate_kw_location.rast
@@ -6,7 +6,8 @@ [email protected]
       [email protected]
         [email protected]
           [email protected] "::"
-          [email protected] "crate"
+          [email protected]
+            [email protected] "crate"
     [email protected] ";"
   [email protected] "\n"
   [email protected]
@@ -18,7 +19,8 @@ [email protected]
         [email protected]
           [email protected]
             [email protected]
-              [email protected] "crate"
+              [email protected]
+                [email protected] "crate"
         [email protected] ","
         [email protected] " "
         [email protected]
@@ -35,7 +37,8 @@ [email protected]
                   [email protected]
                     [email protected]
                       [email protected]
-                        [email protected] "crate"
+                        [email protected]
+                          [email protected] "crate"
                     [email protected] "::"
                     [email protected]
                       [email protected]
@@ -63,7 +66,8 @@ [email protected]
               [email protected] "hello"
         [email protected] "::"
         [email protected]
-          [email protected] "crate"
+          [email protected]
+            [email protected] "crate"
     [email protected] ";"
   [email protected] "\n"
   [email protected]
@@ -78,7 +82,8 @@ [email protected]
                 [email protected] "hello"
           [email protected] "::"
           [email protected]
-            [email protected] "crate"
+            [email protected]
+              [email protected] "crate"
         [email protected] "::"
         [email protected]
           [email protected]
diff --git a/crates/syntax/test_data/parser/err/0041_illegal_super_keyword_location.rast b/crates/syntax/test_data/parser/err/0041_illegal_super_keyword_location.rast
index 2049a9d72..271f8d780 100644
--- a/crates/syntax/test_data/parser/err/0041_illegal_super_keyword_location.rast
+++ b/crates/syntax/test_data/parser/err/0041_illegal_super_keyword_location.rast
@@ -6,7 +6,8 @@ [email protected]
       [email protected]
         [email protected]
           [email protected] "::"
-          [email protected] "super"
+          [email protected]
+            [email protected] "super"
     [email protected] ";"
   [email protected] "\n"
   [email protected]
@@ -20,7 +21,8 @@ [email protected]
               [email protected] "a"
         [email protected] "::"
         [email protected]
-          [email protected] "super"
+          [email protected]
+            [email protected] "super"
     [email protected] ";"
   [email protected] "\n"
   [email protected]
@@ -31,14 +33,16 @@ [email protected]
         [email protected]
           [email protected]
             [email protected]
-              [email protected] "super"
+              [email protected]
+                [email protected] "super"
           [email protected] "::"
           [email protected]
             [email protected]
               [email protected] "a"
         [email protected] "::"
         [email protected]
-          [email protected] "super"
+          [email protected]
+            [email protected] "super"
     [email protected] ";"
   [email protected] "\n"
   [email protected]
@@ -56,7 +60,8 @@ [email protected]
           [email protected]
             [email protected]
               [email protected]
-                [email protected] "super"
+                [email protected]
+                  [email protected] "super"
             [email protected] "::"
             [email protected]
               [email protected]
diff --git a/crates/syntax/test_data/parser/err/0042_illegal_self_keyword_location.rast b/crates/syntax/test_data/parser/err/0042_illegal_self_keyword_location.rast
index deadf56b4..01f601091 100644
--- a/crates/syntax/test_data/parser/err/0042_illegal_self_keyword_location.rast
+++ b/crates/syntax/test_data/parser/err/0042_illegal_self_keyword_location.rast
@@ -6,7 +6,8 @@ [email protected]
       [email protected]
         [email protected]
           [email protected] "::"
-          [email protected] "self"
+          [email protected]
+            [email protected] "self"
     [email protected] ";"
   [email protected] "\n"
   [email protected]
@@ -20,7 +21,8 @@ [email protected]
               [email protected] "a"
         [email protected] "::"
         [email protected]
-          [email protected] "self"
+          [email protected]
+            [email protected] "self"
     [email protected] ";"
   [email protected] "\n"
 error 6..10: The `self` keyword is only allowed as the first segment of a path
diff --git a/crates/syntax/test_data/parser/inline/err/0015_empty_segment.rast b/crates/syntax/test_data/parser/inline/err/0015_empty_segment.rast
index e872526d9..d3c5dde58 100644
--- a/crates/syntax/test_data/parser/inline/err/0015_empty_segment.rast
+++ b/crates/syntax/test_data/parser/inline/err/0015_empty_segment.rast
@@ -6,7 +6,8 @@ [email protected]
       [email protected]
         [email protected]
           [email protected]
-            [email protected] "crate"
+            [email protected]
+              [email protected] "crate"
         [email protected] "::"
     [email protected] ";"
   [email protected] "\n"
diff --git a/crates/syntax/test_data/parser/inline/ok/0002_use_tree_list.rast b/crates/syntax/test_data/parser/inline/ok/0002_use_tree_list.rast
index f40500e38..970826739 100644
--- a/crates/syntax/test_data/parser/inline/ok/0002_use_tree_list.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0002_use_tree_list.rast
@@ -11,7 +11,8 @@ [email protected]
               [email protected]
                 [email protected]
                   [email protected]
-                    [email protected] "crate"
+                    [email protected]
+                      [email protected] "crate"
                 [email protected] "::"
                 [email protected]
                   [email protected]
diff --git a/crates/syntax/test_data/parser/inline/ok/0052_path_type.rast b/crates/syntax/test_data/parser/inline/ok/0052_path_type.rast
index 9bc36bea7..46a103d5b 100644
--- a/crates/syntax/test_data/parser/inline/ok/0052_path_type.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0052_path_type.rast
@@ -42,7 +42,8 @@ [email protected]
       [email protected]
         [email protected]
           [email protected]
-            [email protected] "self"
+            [email protected]
+              [email protected] "self"
         [email protected] "::"
         [email protected]
           [email protected]
@@ -61,7 +62,8 @@ [email protected]
       [email protected]
         [email protected]
           [email protected]
-            [email protected] "super"
+            [email protected]
+              [email protected] "super"
         [email protected] "::"
         [email protected]
           [email protected]
diff --git a/crates/syntax/test_data/parser/inline/ok/0062_mod_contents.rast b/crates/syntax/test_data/parser/inline/ok/0062_mod_contents.rast
index e4fb32de1..583dcac7e 100644
--- a/crates/syntax/test_data/parser/inline/ok/0062_mod_contents.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0062_mod_contents.rast
@@ -43,7 +43,8 @@ [email protected]
     [email protected]
       [email protected]
         [email protected]
-          [email protected] "super"
+          [email protected]
+            [email protected] "super"
       [email protected] "::"
       [email protected]
         [email protected]
diff --git a/crates/syntax/test_data/parser/inline/ok/0067_crate_path.rast b/crates/syntax/test_data/parser/inline/ok/0067_crate_path.rast
index 702f2e0b0..87c0c48dc 100644
--- a/crates/syntax/test_data/parser/inline/ok/0067_crate_path.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0067_crate_path.rast
@@ -6,7 +6,8 @@ [email protected]
       [email protected]
         [email protected]
           [email protected]
-            [email protected] "crate"
+            [email protected]
+              [email protected] "crate"
         [email protected] "::"
         [email protected]
           [email protected]
diff --git a/crates/syntax/test_data/parser/inline/ok/0069_use_tree_list_after_path.rast b/crates/syntax/test_data/parser/inline/ok/0069_use_tree_list_after_path.rast
index c4c5bc51e..192a9cca6 100644
--- a/crates/syntax/test_data/parser/inline/ok/0069_use_tree_list_after_path.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0069_use_tree_list_after_path.rast
@@ -5,7 +5,8 @@ [email protected]
     [email protected]
       [email protected]
         [email protected]
-          [email protected] "crate"
+          [email protected]
+            [email protected] "crate"
       [email protected] "::"
       [email protected]
         [email protected] "{"
@@ -23,7 +24,8 @@ [email protected]
     [email protected]
       [email protected]
         [email protected]
-          [email protected] "self"
+          [email protected]
+            [email protected] "self"
       [email protected] "::"
       [email protected]
         [email protected] "{"
diff --git a/crates/syntax/test_data/parser/inline/ok/0117_macro_call_type.rast b/crates/syntax/test_data/parser/inline/ok/0117_macro_call_type.rast
index f3d4ad72c..3016a6574 100644
--- a/crates/syntax/test_data/parser/inline/ok/0117_macro_call_type.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0117_macro_call_type.rast
@@ -30,7 +30,8 @@ [email protected]
       [email protected]
         [email protected]
           [email protected]
-            [email protected] "crate"
+            [email protected]
+              [email protected] "crate"
         [email protected] "::"
         [email protected]
           [email protected]
diff --git a/crates/syntax/test_data/parser/inline/ok/0125_crate_keyword_path.rast b/crates/syntax/test_data/parser/inline/ok/0125_crate_keyword_path.rast
index aa4d7a784..0fed2d311 100644
--- a/crates/syntax/test_data/parser/inline/ok/0125_crate_keyword_path.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0125_crate_keyword_path.rast
@@ -17,7 +17,8 @@ [email protected]
             [email protected]
               [email protected]
                 [email protected]
-                  [email protected] "crate"
+                  [email protected]
+                    [email protected] "crate"
               [email protected] "::"
               [email protected]
                 [email protected]
diff --git a/crates/syntax/test_data/parser/inline/ok/0153_pub_parens_typepath.rast b/crates/syntax/test_data/parser/inline/ok/0153_pub_parens_typepath.rast
index c204f0e2d..a5ee07499 100644
--- a/crates/syntax/test_data/parser/inline/ok/0153_pub_parens_typepath.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0153_pub_parens_typepath.rast
@@ -16,7 +16,8 @@ [email protected]
             [email protected]
               [email protected]
                 [email protected]
-                  [email protected] "super"
+                  [email protected]
+                    [email protected] "super"
               [email protected] "::"
               [email protected]
                 [email protected]
@@ -42,7 +43,8 @@ [email protected]
             [email protected]
               [email protected]
                 [email protected]
-                  [email protected] "crate"
+                  [email protected]
+                    [email protected] "crate"
               [email protected] "::"
               [email protected]
                 [email protected]
diff --git a/crates/syntax/test_data/parser/ok/0013_use_path_self_super.rast b/crates/syntax/test_data/parser/ok/0013_use_path_self_super.rast
index 66ab13660..dba74e222 100644
--- a/crates/syntax/test_data/parser/ok/0013_use_path_self_super.rast
+++ b/crates/syntax/test_data/parser/ok/0013_use_path_self_super.rast
@@ -6,7 +6,8 @@ [email protected]
       [email protected]
         [email protected]
           [email protected]
-            [email protected] "self"
+            [email protected]
+              [email protected] "self"
         [email protected] "::"
         [email protected]
           [email protected]
@@ -21,10 +22,12 @@ [email protected]
         [email protected]
           [email protected]
             [email protected]
-              [email protected] "super"
+              [email protected]
+                [email protected] "super"
           [email protected] "::"
           [email protected]
-            [email protected] "super"
+            [email protected]
+              [email protected] "super"
         [email protected] "::"
         [email protected]
           [email protected]
diff --git a/crates/syntax/test_data/parser/ok/0020_type_param_bounds.rast b/crates/syntax/test_data/parser/ok/0020_type_param_bounds.rast
index 0612a71de..21c564a20 100644
--- a/crates/syntax/test_data/parser/ok/0020_type_param_bounds.rast
+++ b/crates/syntax/test_data/parser/ok/0020_type_param_bounds.rast
@@ -187,7 +187,8 @@ [email protected]
               [email protected]
                 [email protected]
                   [email protected]
-                    [email protected] "self"
+                    [email protected]
+                      [email protected] "self"
                 [email protected] "::"
                 [email protected]
                   [email protected]
diff --git a/crates/syntax/test_data/parser/ok/0034_crate_path_in_call.rast b/crates/syntax/test_data/parser/ok/0034_crate_path_in_call.rast
index 5ad8c570d..a0a5ca7f5 100644
--- a/crates/syntax/test_data/parser/ok/0034_crate_path_in_call.rast
+++ b/crates/syntax/test_data/parser/ok/0034_crate_path_in_call.rast
@@ -25,7 +25,8 @@ [email protected]
                 [email protected]
                   [email protected]
                     [email protected]
-                      [email protected] "crate"
+                      [email protected]
+                        [email protected] "crate"
                   [email protected] "::"
                   [email protected]
                     [email protected]