Move to upstream `macro_rules!` model

5 files changed, 38 insertions, 45 deletions

diff --git a/crates/syntax/test_data/parser/err/0002_duplicate_shebang.rast b/crates/syntax/test_data/parser/err/0002_duplicate_shebang.rast
index 4cfd1bce4..9ad5b12b8 100644
--- a/crates/syntax/test_data/parser/err/0002_duplicate_shebang.rast
+++ b/crates/syntax/test_data/parser/err/0002_duplicate_shebang.rast
@@ -17,14 +17,17 @@ [email protected]
           [email protected] "bin"
   [email protected]
     [email protected] "/"
-  MACRO_CALL@32..41
+  MACRO_CALL@32..35
     [email protected]
       [email protected]
         [email protected]
           [email protected] "env"
-    [email protected] " "
-    [email protected]
-      [email protected] "rusti"
+  [email protected] " "
+  [email protected]
+    [email protected]
+      [email protected]
+        [email protected]
+          [email protected] "rusti"
   [email protected] "\n"
 error 23..23: expected `[`
 error 23..23: expected an item
@@ -35,5 +38,8 @@ error 31..31: expected `{`, `[`, `(`
 error 31..31: expected SEMICOLON
 error 31..31: expected an item
 error 35..35: expected BANG
+error 35..35: expected `{`, `[`, `(`
+error 35..35: expected SEMICOLON
+error 41..41: expected BANG
 error 41..41: expected `{`, `[`, `(`
 error 41..41: expected SEMICOLON
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 de8217064..e4fb32de1 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
@@ -12,11 +12,8 @@ [email protected]
       [email protected] "{"
       [email protected] "}"
   [email protected] "\n"
-  [email protected]
-    [email protected]
-      [email protected]
-        [email protected]
-          [email protected] "macro_rules"
+  [email protected]
+    [email protected] "macro_rules"
     [email protected] "!"
     [email protected] " "
     [email protected]
diff --git a/crates/syntax/test_data/parser/inline/ok/0096_no_semi_after_block.rast b/crates/syntax/test_data/parser/inline/ok/0096_no_semi_after_block.rast
index e757249f0..e84b9164f 100644
--- a/crates/syntax/test_data/parser/inline/ok/0096_no_semi_after_block.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0096_no_semi_after_block.rast
@@ -82,32 +82,28 @@ [email protected]
           [email protected] "{"
           [email protected] "}"
       [email protected] "\n    "
-      [email protected]
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected] "macro_rules"
-          [email protected] "!"
-          [email protected] " "
-          [email protected]
-            [email protected] "test"
-          [email protected] " "
-          [email protected]
-            [email protected] "{"
-            [email protected] "\n         "
-            [email protected]
-              [email protected] "("
-              [email protected] ")"
-            [email protected] " "
-            [email protected] "="
-            [email protected] ">"
-            [email protected] " "
-            [email protected]
-              [email protected] "{"
-              [email protected] "}"
-            [email protected] "\n    "
-            [email protected] "}"
+      [email protected]
+        [email protected] "macro_rules"
+        [email protected] "!"
+        [email protected] " "
+        [email protected]
+          [email protected] "test"
+        [email protected] " "
+        [email protected]
+          [email protected] "{"
+          [email protected] "\n         "
+          [email protected]
+            [email protected] "("
+            [email protected] ")"
+          [email protected] " "
+          [email protected] "="
+          [email protected] ">"
+          [email protected] " "
+          [email protected]
+            [email protected] "{"
+            [email protected] "}"
+          [email protected] "\n    "
+          [email protected] "}"
       [email protected] "\n    "
       [email protected]
         [email protected]
diff --git a/crates/syntax/test_data/parser/inline/ok/0160_try_macro_rules.rast b/crates/syntax/test_data/parser/inline/ok/0160_try_macro_rules.rast
index 05b89d1c3..d1c22947b 100644
--- a/crates/syntax/test_data/parser/inline/ok/0160_try_macro_rules.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0160_try_macro_rules.rast
@@ -1,9 +1,6 @@
 [email protected]
-  [email protected]
-    [email protected]
-      [email protected]
-        [email protected]
-          [email protected] "macro_rules"
+  [email protected]
+    [email protected] "macro_rules"
     [email protected] "!"
     [email protected] " "
     [email protected]
diff --git a/crates/syntax/test_data/parser/ok/0053_outer_attribute_on_macro_rules.rast b/crates/syntax/test_data/parser/ok/0053_outer_attribute_on_macro_rules.rast
index be60f7a8e..87d8ebcba 100644
--- a/crates/syntax/test_data/parser/ok/0053_outer_attribute_on_macro_rules.rast
+++ b/crates/syntax/test_data/parser/ok/0053_outer_attribute_on_macro_rules.rast
@@ -1,5 +1,5 @@
 [email protected]
-  MACRO_CALL@0..64
+  MACRO_RULES@0..64
     [email protected] "/// Some docs"
     [email protected] "\n"
     [email protected]
@@ -11,10 +11,7 @@ [email protected]
             [email protected] "macro_export"
       [email protected] "]"
     [email protected] "\n"
-    [email protected]
-      [email protected]
-        [email protected]
-          [email protected] "macro_rules"
+    [email protected] "macro_rules"
     [email protected] "!"
     [email protected] " "
     [email protected]