Skip to content

Commit ffc3dc9

Browse files
Merge #30
30: Revert macro changes r=jonas-schievink a=jonas-schievink I came up with a less invasive solution for #7717 bors r+ Co-authored-by: Jonas Schievink <jonasschievink@gmail.com>
2 parents 4a6a83e + fab562a commit ffc3dc9

File tree

1 file changed

+3
-6
lines changed

1 file changed

+3
-6
lines changed

rust.ungram

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ Item =
9090
| ExternCrate
9191
| Fn
9292
| Impl
93-
| MacroItem
93+
| MacroCall
9494
| MacroRules
9595
| MacroDef
9696
| Module
@@ -101,9 +101,6 @@ Item =
101101
| Union
102102
| Use
103103

104-
MacroItem =
105-
MacroCall
106-
107104
MacroRules =
108105
Attr* Visibility?
109106
'macro_rules' '!' Name
@@ -251,7 +248,7 @@ AssocItemList =
251248
AssocItem =
252249
Const
253250
| Fn
254-
| MacroItem
251+
| MacroCall
255252
| TypeAlias
256253

257254
Impl =
@@ -268,7 +265,7 @@ ExternItemList =
268265

269266
ExternItem =
270267
Fn
271-
| MacroItem
268+
| MacroCall
272269
| Static
273270
| TypeAlias
274271

0 commit comments

Comments
 (0)