diff options
| author | bors <bors@rust-lang.org> | 2016-07-28 00:01:54 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-28 00:01:54 -0700 |
| commit | 1895bf760d4f7d11510619fd7ee794aa5afc4803 (patch) | |
| tree | 750edd1e7f1071fc5622276954deefb0551d5698 /src/libsyntax/tokenstream.rs | |
| parent | f5d79521ae1bd53d90e820e9f8c78494fb3a102d (diff) | |
| parent | 448550223b4e80d722c18361c465a24889e37c40 (diff) | |
| download | rust-1895bf760d4f7d11510619fd7ee794aa5afc4803.tar.gz rust-1895bf760d4f7d11510619fd7ee794aa5afc4803.zip | |
Auto merge of #34908 - jseyfried:improve_tt_matchers, r=nrc
macros: Improve `tt` matchers Fixes #5846, fixes #22819. r? @nrc
Diffstat (limited to 'src/libsyntax/tokenstream.rs')
| -rw-r--r-- | src/libsyntax/tokenstream.rs | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/libsyntax/tokenstream.rs b/src/libsyntax/tokenstream.rs index 0ad09fd0f7d..d38edf81688 100644 --- a/src/libsyntax/tokenstream.rs +++ b/src/libsyntax/tokenstream.rs @@ -135,6 +135,7 @@ impl TokenTree { } TokenTree::Token(_, token::SpecialVarNt(..)) => 2, TokenTree::Token(_, token::MatchNt(..)) => 3, + TokenTree::Token(_, token::Interpolated(Nonterminal::NtTT(..))) => 1, TokenTree::Delimited(_, ref delimed) => delimed.tts.len() + 2, TokenTree::Sequence(_, ref seq) => seq.tts.len(), TokenTree::Token(..) => 0, @@ -197,6 +198,9 @@ impl TokenTree { TokenTree::Token(sp, token::Ident(kind))]; v[index].clone() } + (&TokenTree::Token(_, token::Interpolated(Nonterminal::NtTT(ref tt))), _) => { + tt.clone().unwrap() + } (&TokenTree::Sequence(_, ref seq), _) => seq.tts[index].clone(), _ => panic!("Cannot expand a token tree"), } |