about summary refs log tree commit diff
diff options
context:
space:
mode:
authorJohann Hemmann <johann.hemmann@code.berlin>2024-01-17 12:24:18 +0100
committerJohann Hemmann <johann.hemmann@code.berlin>2024-01-17 12:49:58 +0100
commit76c67dd2291a662b40b9867c0f6bb564e5783889 (patch)
tree22bb48a83f4a2954269ec83655e32452f672ae78
parent5916da2c29d7e0f12057a44702c12cb40edb38f8 (diff)
downloadrust-76c67dd2291a662b40b9867c0f6bb564e5783889.tar.gz
rust-76c67dd2291a662b40b9867c0f6bb564e5783889.zip
Fix test
-rw-r--r--crates/parser/src/grammar/items.rs2
-rw-r--r--crates/parser/test_data/parser/inline/err/0026_macro_rules_as_macro_name.rast18
-rw-r--r--crates/parser/test_data/parser/inline/err/0026_macro_rules_as_macro_name.rs1
-rw-r--r--crates/parser/test_data/parser/inline/ok/0208_macro_rules_as_macro_name.rast12
-rw-r--r--crates/parser/test_data/parser/inline/ok/0208_macro_rules_as_macro_name.rs1
5 files changed, 18 insertions, 16 deletions
diff --git a/crates/parser/src/grammar/items.rs b/crates/parser/src/grammar/items.rs
index 5050cad5e81..79347617055 100644
--- a/crates/parser/src/grammar/items.rs
+++ b/crates/parser/src/grammar/items.rs
@@ -60,7 +60,6 @@ pub(super) fn item_or_macro(p: &mut Parser<'_>, stop_on_r_curly: bool) {
 
     // test macro_rules_as_macro_name
     // macro_rules! {}
-    // macro_rules! {};
     // macro_rules! ();
     // macro_rules! [];
     // fn main() {
@@ -68,6 +67,7 @@ pub(super) fn item_or_macro(p: &mut Parser<'_>, stop_on_r_curly: bool) {
     // }
 
     // test_err macro_rules_as_macro_name
+    // macro_rules! {};
     // macro_rules! ()
     // macro_rules! []
     if paths::is_use_path_start(p)
diff --git a/crates/parser/test_data/parser/inline/err/0026_macro_rules_as_macro_name.rast b/crates/parser/test_data/parser/inline/err/0026_macro_rules_as_macro_name.rast
index d5ab611629c..79d428a41c8 100644
--- a/crates/parser/test_data/parser/inline/err/0026_macro_rules_as_macro_name.rast
+++ b/crates/parser/test_data/parser/inline/err/0026_macro_rules_as_macro_name.rast
@@ -7,6 +7,19 @@ SOURCE_FILE
     BANG "!"
     WHITESPACE " "
     TOKEN_TREE
+      L_CURLY "{"
+      R_CURLY "}"
+  ERROR
+    SEMICOLON ";"
+  WHITESPACE "\n"
+  MACRO_CALL
+    PATH
+      PATH_SEGMENT
+        NAME_REF
+          IDENT "macro_rules"
+    BANG "!"
+    WHITESPACE " "
+    TOKEN_TREE
       L_PAREN "("
       R_PAREN ")"
   WHITESPACE "\n"
@@ -21,5 +34,6 @@ SOURCE_FILE
       L_BRACK "["
       R_BRACK "]"
   WHITESPACE "\n"
-error 15: expected SEMICOLON
-error 31: expected SEMICOLON
+error 15: expected an item
+error 32: expected SEMICOLON
+error 48: expected SEMICOLON
diff --git a/crates/parser/test_data/parser/inline/err/0026_macro_rules_as_macro_name.rs b/crates/parser/test_data/parser/inline/err/0026_macro_rules_as_macro_name.rs
index be633aa6990..e8d402443d6 100644
--- a/crates/parser/test_data/parser/inline/err/0026_macro_rules_as_macro_name.rs
+++ b/crates/parser/test_data/parser/inline/err/0026_macro_rules_as_macro_name.rs
@@ -1,2 +1,3 @@
+macro_rules! {};
 macro_rules! ()
 macro_rules! []
diff --git a/crates/parser/test_data/parser/inline/ok/0208_macro_rules_as_macro_name.rast b/crates/parser/test_data/parser/inline/ok/0208_macro_rules_as_macro_name.rast
index c3e0f8a5e02..b997250ab4d 100644
--- a/crates/parser/test_data/parser/inline/ok/0208_macro_rules_as_macro_name.rast
+++ b/crates/parser/test_data/parser/inline/ok/0208_macro_rules_as_macro_name.rast
@@ -18,18 +18,6 @@ SOURCE_FILE
     BANG "!"
     WHITESPACE " "
     TOKEN_TREE
-      L_CURLY "{"
-      R_CURLY "}"
-    SEMICOLON ";"
-  WHITESPACE "\n"
-  MACRO_CALL
-    PATH
-      PATH_SEGMENT
-        NAME_REF
-          IDENT "macro_rules"
-    BANG "!"
-    WHITESPACE " "
-    TOKEN_TREE
       L_PAREN "("
       R_PAREN ")"
     SEMICOLON ";"
diff --git a/crates/parser/test_data/parser/inline/ok/0208_macro_rules_as_macro_name.rs b/crates/parser/test_data/parser/inline/ok/0208_macro_rules_as_macro_name.rs
index 2ab949b6363..4c2ea378cbf 100644
--- a/crates/parser/test_data/parser/inline/ok/0208_macro_rules_as_macro_name.rs
+++ b/crates/parser/test_data/parser/inline/ok/0208_macro_rules_as_macro_name.rs
@@ -1,5 +1,4 @@
 macro_rules! {}
-macro_rules! {};
 macro_rules! ();
 macro_rules! [];
 fn main() {