From 98718e0544f42e55642d2838b00d6a7bef1e2414 Mon Sep 17 00:00:00 2001
From: Lukas Wirth <lukastw97@gmail.com>
Date: Fri, 15 Jan 2021 21:07:38 +0100
Subject: Wrap remaining self/super/crate in Name{Ref}

---
 .../test_data/parser/ok/0007_extern_crate.rast     |  3 ++-
 .../test_data/parser/ok/0012_visibility.rast       | 10 +++++++--
 .../parser/ok/0045_block_inner_attrs.rast          |  3 ++-
 .../test_data/parser/ok/0051_parameter_attrs.rast  | 24 ++++++++++++++--------
 4 files changed, 28 insertions(+), 12 deletions(-)

(limited to 'crates/syntax/test_data/parser/ok')

diff --git a/crates/syntax/test_data/parser/ok/0007_extern_crate.rast b/crates/syntax/test_data/parser/ok/0007_extern_crate.rast
index 594c2f8f2..4babdba92 100644
--- a/crates/syntax/test_data/parser/ok/0007_extern_crate.rast
+++ b/crates/syntax/test_data/parser/ok/0007_extern_crate.rast
@@ -28,7 +28,8 @@ SOURCE_FILE@0..69
     WHITESPACE@49..50 " "
     CRATE_KW@50..55 "crate"
     WHITESPACE@55..56 " "
-    SELF_KW@56..60 "self"
+    NAME_REF@56..60
+      SELF_KW@56..60 "self"
     WHITESPACE@60..61 " "
     RENAME@61..67
       AS_KW@61..63 "as"
diff --git a/crates/syntax/test_data/parser/ok/0012_visibility.rast b/crates/syntax/test_data/parser/ok/0012_visibility.rast
index 83a93b5a9..c5dbfb702 100644
--- a/crates/syntax/test_data/parser/ok/0012_visibility.rast
+++ b/crates/syntax/test_data/parser/ok/0012_visibility.rast
@@ -32,7 +32,10 @@ SOURCE_FILE@0..98
     VISIBILITY@24..34
       PUB_KW@24..27 "pub"
       L_PAREN@27..28 "("
-      CRATE_KW@28..33 "crate"
+      PATH@28..33
+        PATH_SEGMENT@28..33
+          NAME_REF@28..33
+            CRATE_KW@28..33 "crate"
       R_PAREN@33..34 ")"
     WHITESPACE@34..35 " "
     FN_KW@35..37 "fn"
@@ -51,7 +54,10 @@ SOURCE_FILE@0..98
     VISIBILITY@45..55
       PUB_KW@45..48 "pub"
       L_PAREN@48..49 "("
-      SUPER_KW@49..54 "super"
+      PATH@49..54
+        PATH_SEGMENT@49..54
+          NAME_REF@49..54
+            SUPER_KW@49..54 "super"
       R_PAREN@54..55 ")"
     WHITESPACE@55..56 " "
     FN_KW@56..58 "fn"
diff --git a/crates/syntax/test_data/parser/ok/0045_block_inner_attrs.rast b/crates/syntax/test_data/parser/ok/0045_block_inner_attrs.rast
index 0ac56df6d..6afed5f05 100644
--- a/crates/syntax/test_data/parser/ok/0045_block_inner_attrs.rast
+++ b/crates/syntax/test_data/parser/ok/0045_block_inner_attrs.rast
@@ -110,7 +110,8 @@ SOURCE_FILE@0..686
           L_PAREN@558..559 "("
           SELF_PARAM@559..564
             AMP@559..560 "&"
-            SELF_KW@560..564 "self"
+            NAME@560..564
+              SELF_KW@560..564 "self"
           COMMA@564..565 ","
           WHITESPACE@565..566 " "
           PARAM@566..600
diff --git a/crates/syntax/test_data/parser/ok/0051_parameter_attrs.rast b/crates/syntax/test_data/parser/ok/0051_parameter_attrs.rast
index 3fed11838..e10521d85 100644
--- a/crates/syntax/test_data/parser/ok/0051_parameter_attrs.rast
+++ b/crates/syntax/test_data/parser/ok/0051_parameter_attrs.rast
@@ -281,7 +281,8 @@ SOURCE_FILE@0..519
                     IDENT@259..267 "must_use"
               R_BRACK@267..268 "]"
             WHITESPACE@268..269 " "
-            SELF_KW@269..273 "self"
+            NAME@269..273
+              SELF_KW@269..273 "self"
           R_PAREN@273..274 ")"
         WHITESPACE@274..275 " "
         BLOCK_EXPR@275..277
@@ -305,7 +306,8 @@ SOURCE_FILE@0..519
                     IDENT@291..295 "attr"
               R_BRACK@295..296 "]"
             WHITESPACE@296..297 " "
-            SELF_KW@297..301 "self"
+            NAME@297..301
+              SELF_KW@297..301 "self"
           R_PAREN@301..302 ")"
         WHITESPACE@302..303 " "
         BLOCK_EXPR@303..305
@@ -330,7 +332,8 @@ SOURCE_FILE@0..519
               R_BRACK@323..324 "]"
             WHITESPACE@324..325 " "
             AMP@325..326 "&"
-            SELF_KW@326..330 "self"
+            NAME@326..330
+              SELF_KW@326..330 "self"
           R_PAREN@330..331 ")"
         WHITESPACE@331..332 " "
         BLOCK_EXPR@332..334
@@ -363,7 +366,8 @@ SOURCE_FILE@0..519
             AMP@358..359 "&"
             MUT_KW@359..362 "mut"
             WHITESPACE@362..363 " "
-            SELF_KW@363..367 "self"
+            NAME@363..367
+              SELF_KW@363..367 "self"
           R_PAREN@367..368 ")"
         WHITESPACE@368..369 " "
         BLOCK_EXPR@369..371
@@ -397,7 +401,8 @@ SOURCE_FILE@0..519
             LIFETIME@396..398
               LIFETIME_IDENT@396..398 "\'a"
             WHITESPACE@398..399 " "
-            SELF_KW@399..403 "self"
+            NAME@399..403
+              SELF_KW@399..403 "self"
           R_PAREN@403..404 ")"
         WHITESPACE@404..405 " "
         BLOCK_EXPR@405..407
@@ -433,7 +438,8 @@ SOURCE_FILE@0..519
             WHITESPACE@434..435 " "
             MUT_KW@435..438 "mut"
             WHITESPACE@438..439 " "
-            SELF_KW@439..443 "self"
+            NAME@439..443
+              SELF_KW@439..443 "self"
           R_PAREN@443..444 ")"
         WHITESPACE@444..445 " "
         BLOCK_EXPR@445..447
@@ -457,7 +463,8 @@ SOURCE_FILE@0..519
                     IDENT@460..464 "attr"
               R_BRACK@464..465 "]"
             WHITESPACE@465..466 " "
-            SELF_KW@466..470 "self"
+            NAME@466..470
+              SELF_KW@466..470 "self"
             COLON@470..471 ":"
             WHITESPACE@471..472 " "
             PATH_TYPE@472..476
@@ -488,7 +495,8 @@ SOURCE_FILE@0..519
                     IDENT@493..497 "attr"
               R_BRACK@497..498 "]"
             WHITESPACE@498..499 " "
-            SELF_KW@499..503 "self"
+            NAME@499..503
+              SELF_KW@499..503 "self"
             COLON@503..504 ":"
             WHITESPACE@504..505 " "
             PATH_TYPE@505..513
-- 
cgit v1.2.3