bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

Fix remaining meta-variable expression TODOs

Browse source
This commit is contained in:
Caio 2022-03-14 08:29:20 -03:00
parent b7511248f9
commit 5d333c155e
4 changed files with 16 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

7
compiler/rustc_expand/src/mbe/macro_parser.rs
View file

@ -324,8 +324,11 @@ pub(super) fn count_names(ms: &[TokenTree]) -> usize {
TokenTree::Delimited(_, ref delim) => count_names(&delim.tts),
TokenTree::MetaVar(..) => 0,
TokenTree::MetaVarDecl(..) => 1,
// FIXME(c410-f3r) MetaVarExpr should be handled instead of being ignored
// https://github.com/rust-lang/rust/issues/9390
// Panicking here would abort execution because `parse_tree` makes use of this
// function. In other words, RHS meta-variable expressions eventually end-up here.
//
// `0` is still returned to inform that no meta-variable was found. `Meta-variables
// != Meta-variable expressions`
TokenTree::MetaVarExpr(..) => 0,
TokenTree::Sequence(_, ref seq) => seq.num_captures,
TokenTree::Token(..) => 0,