Merge #7291

7291: Wrap remaining self/super/crate in Name{Ref} r=matklad a=Veykril

That should be the remaining special casing for `self` 🎉 

Co-authored-by: Lukas Wirth <[email protected]>

8 files changed, 86 insertions, 38 deletions

diff --git a/crates/syntax/test_data/parser/inline/ok/0006_self_param.rast b/crates/syntax/test_data/parser/inline/ok/0006_self_param.rast
index 8048f5fad..f0d152d33 100644
--- a/crates/syntax/test_data/parser/inline/ok/0006_self_param.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0006_self_param.rast
@@ -19,7 +19,8 @@ [email protected]
         [email protected]
           [email protected] "("
           [email protected]
-            [email protected] "self"
+            [email protected]
+              [email protected] "self"
           [email protected] ")"
         [email protected] " "
         [email protected]
@@ -35,7 +36,8 @@ [email protected]
           [email protected] "("
           [email protected]
             [email protected] "&"
-            [email protected] "self"
+            [email protected]
+              [email protected] "self"
           [email protected] ","
           [email protected] ")"
         [email protected] " "
@@ -55,7 +57,8 @@ [email protected]
             [email protected]
               [email protected] "\'a"
             [email protected] " "
-            [email protected] "self"
+            [email protected]
+              [email protected] "self"
           [email protected] ","
           [email protected] ")"
         [email protected] " "
@@ -77,7 +80,8 @@ [email protected]
             [email protected] " "
             [email protected] "mut"
             [email protected] " "
-            [email protected] "self"
+            [email protected]
+              [email protected] "self"
           [email protected] ","
           [email protected] " "
           [email protected]
@@ -107,7 +111,8 @@ [email protected]
           [email protected]
             [email protected] "mut"
             [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/0018_arb_self_types.rast b/crates/syntax/test_data/parser/inline/ok/0018_arb_self_types.rast
index ddbd66588..df59f37a2 100644
--- a/crates/syntax/test_data/parser/inline/ok/0018_arb_self_types.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0018_arb_self_types.rast
@@ -19,7 +19,8 @@ [email protected]
         [email protected]
           [email protected] "("
           [email protected]
-            [email protected] "self"
+            [email protected]
+              [email protected] "self"
             [email protected] ":"
             [email protected] " "
             [email protected]
@@ -45,7 +46,8 @@ [email protected]
           [email protected]
             [email protected] "mut"
             [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/0021_impl_item_list.rast b/crates/syntax/test_data/parser/inline/ok/0021_impl_item_list.rast
index ca0702aba..dc7f6295b 100644
--- a/crates/syntax/test_data/parser/inline/ok/0021_impl_item_list.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0021_impl_item_list.rast
@@ -67,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]
diff --git a/crates/syntax/test_data/parser/inline/ok/0022_crate_visibility.rast b/crates/syntax/test_data/parser/inline/ok/0022_crate_visibility.rast
index 50742cbcf..f2ead8a62 100644
--- a/crates/syntax/test_data/parser/inline/ok/0022_crate_visibility.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0022_crate_visibility.rast
@@ -1,9 +1,12 @@
-SOURCE_FILE@0..81
+SOURCE_FILE@0..62
   [email protected]
     [email protected]
       [email protected] "pub"
       [email protected] "("
-      [email protected] "crate"
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected] "crate"
       [email protected] ")"
     [email protected] " "
     [email protected] "struct"
@@ -16,7 +19,10 @@ [email protected]
     [email protected]
       [email protected] "pub"
       [email protected] "("
-      [email protected] "self"
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected] "self"
       [email protected] ")"
     [email protected] " "
     [email protected] "struct"
@@ -25,29 +31,19 @@ [email protected]
       [email protected] "S"
     [email protected] ";"
   [email protected] "\n"
-  [email protected]0
-    [email protected]0
+  [email protected]1
+    [email protected]1
       [email protected] "pub"
       [email protected] "("
-      [email protected] "self"
-      [email protected] ")"
-    [email protected] " "
-    [email protected] "struct"
-    [email protected] " "
-    [email protected]
-      [email protected] "S"
-    [email protected] ";"
-  [email protected] "\n"
-  [email protected]
-    [email protected]
-      [email protected] "pub"
-      [email protected] "("
-      [email protected] "self"
-      [email protected] ")"
-    [email protected] " "
-    [email protected] "struct"
-    [email protected] " "
-    [email protected]
-      [email protected] "S"
-    [email protected] ";"
-  [email protected] "\n"
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected] "super"
+      [email protected] ")"
+    [email protected] " "
+    [email protected] "struct"
+    [email protected] " "
+    [email protected]
+      [email protected] "S"
+    [email protected] ";"
+  [email protected] "\n"
diff --git a/crates/syntax/test_data/parser/inline/ok/0022_crate_visibility.rs b/crates/syntax/test_data/parser/inline/ok/0022_crate_visibility.rs
index faeefde94..a790a485f 100644
--- a/crates/syntax/test_data/parser/inline/ok/0022_crate_visibility.rs
+++ b/crates/syntax/test_data/parser/inline/ok/0022_crate_visibility.rs
@@ -1,4 +1,3 @@
 pub(crate) struct S;
 pub(self) struct S;
-pub(self) struct S;
-pub(self) struct S;
+pub(super) struct S;
diff --git a/crates/syntax/test_data/parser/inline/ok/0138_self_param_outer_attr.rast b/crates/syntax/test_data/parser/inline/ok/0138_self_param_outer_attr.rast
index d3219f0b2..c54e64e3f 100644
--- a/crates/syntax/test_data/parser/inline/ok/0138_self_param_outer_attr.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0138_self_param_outer_attr.rast
@@ -16,7 +16,8 @@ [email protected]
                 [email protected] "must_use"
           [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/0160_crate_visibility_in.rast b/crates/syntax/test_data/parser/inline/ok/0160_crate_visibility_in.rast
new file mode 100644
index 000000000..3d855fc6b
--- /dev/null
+++ b/crates/syntax/test_data/parser/inline/ok/0160_crate_visibility_in.rast
@@ -0,0 +1,42 @@
+[email protected]
+  [email protected]
+    [email protected]
+      [email protected] "pub"
+      [email protected] "("
+      [email protected] "in"
+      [email protected] " "
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected] "super"
+        [email protected] "::"
+        [email protected]
+          [email protected]
+            [email protected] "A"
+      [email protected] ")"
+    [email protected] " "
+    [email protected] "struct"
+    [email protected] " "
+    [email protected]
+      [email protected] "S"
+    [email protected] ";"
+  [email protected] "\n"
+  [email protected]
+    [email protected]
+      [email protected] "pub"
+      [email protected] "("
+      [email protected] "in"
+      [email protected] " "
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected] "crate"
+      [email protected] ")"
+    [email protected] " "
+    [email protected] "struct"
+    [email protected] " "
+    [email protected]
+      [email protected] "S"
+    [email protected] ";"
+  [email protected] "\n"
diff --git a/crates/syntax/test_data/parser/inline/ok/0160_crate_visibility_in.rs b/crates/syntax/test_data/parser/inline/ok/0160_crate_visibility_in.rs
new file mode 100644
index 000000000..2856dbd84
--- /dev/null
+++ b/crates/syntax/test_data/parser/inline/ok/0160_crate_visibility_in.rs
@@ -0,0 +1,2 @@
+pub(in super::A) struct S;
+pub(in crate) struct S;