Unnamed repository; edit this file 'description' to name the repository.
Merge rust-analyzer/ungrammar#30
30: Revert macro changes r=jonas-schievink a=jonas-schievink I came up with a less invasive solution for https://github.com/rust-analyzer/rust-analyzer/issues/7717 bors r+ Co-authored-by: Jonas Schievink <[email protected]>
bors[bot] 2021-03-15
parent 49b21c2 · parent 7359cc1 · commit f74bfe0
-rw-r--r--lib/ungrammar/rust.ungram9
1 files changed, 3 insertions, 6 deletions
diff --git a/lib/ungrammar/rust.ungram b/lib/ungrammar/rust.ungram
index 4dbf43c7bd..3d2e189edf 100644
--- a/lib/ungrammar/rust.ungram
+++ b/lib/ungrammar/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