resolve conflict

rust-lang · Mar 18, 2022 · 8991293 · 8991293
1 parent c52d033
commit 8991293
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/compiler/rustc_expand/src/mbe/macro_parser.rs b/compiler/rustc_expand/src/mbe/macro_parser.rs
@@ -652,7 +652,7 @@ fn parse_tt_inner<'root, 'tt>(
                 }
 
                 // These cannot appear in a matcher.
-                TokenTree::Token(..) | TokenTree::MetaVar(..) => unreachable!(),
+                TokenTree::MetaVar(..) | TokenTree::MetaVarExpr(..) => unreachable!(),
             }
         }
     }