Skip to content

Commit c52d033

Browse files
committed
resolve conflict
1 parent a01b4cf commit c52d033

File tree

1 file changed

+2
-5
lines changed

1 file changed

+2
-5
lines changed

compiler/rustc_expand/src/mbe/macro_parser.rs

+2-5
Original file line numberDiff line numberDiff line change
@@ -651,11 +651,8 @@ fn parse_tt_inner<'root, 'tt>(
651651
next_items.push(item);
652652
}
653653

654-
// There was another token that was not `token`... This means we can't add any
655-
// rules. NOTE that this is not necessarily an error unless _all_ items in
656-
// `cur_items` end up doing this. There may still be some other matchers that do
657-
// end up working out.
658-
TokenTree::Token(..) | TokenTree::MetaVar(..) => {}
654+
// These cannot appear in a matcher.
655+
TokenTree::Token(..) | TokenTree::MetaVar(..) => unreachable!(),
659656
}
660657
}
661658
}

0 commit comments

Comments
 (0)