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>

Author: bors[bot]

rust.ungram

@@ -90,7 +90,7 @@ Item =
 | ExternCrate
 | Fn
 | Impl
-| MacroItem
+| MacroCall
 | MacroRules
 | MacroDef
 | Module
@@ -101,9 +101,6 @@ Item =
 | Union
 | Use
 
-MacroItem =
-  MacroCall
-
 MacroRules =
   Attr* Visibility?
   'macro_rules' '!' Name
@@ -251,7 +248,7 @@ AssocItemList =
 AssocItem =
   Const
 | Fn
-| MacroItem
+| MacroCall
 | TypeAlias
 
 Impl =
@@ -268,7 +265,7 @@ ExternItemList =
 
 ExternItem =
   Fn
-| MacroItem
+| MacroCall
 | Static
 | TypeAlias