Skip to content

Commit 8991293

Browse files
committed
resolve conflict
1 parent c52d033 commit 8991293

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

compiler/rustc_expand/src/mbe/macro_parser.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -652,7 +652,7 @@ fn parse_tt_inner<'root, 'tt>(
652652
}
653653

654654
// These cannot appear in a matcher.
655-
TokenTree::Token(..) | TokenTree::MetaVar(..) => unreachable!(),
655+
TokenTree::MetaVar(..) | TokenTree::MetaVarExpr(..) => unreachable!(),
656656
}
657657
}
658658
}

0 commit comments

Comments
 (0)