macros: fix partially consumed tokens in macro matchers #37208
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
nrc
reviewed
Oct 17, 2016
| let match_cur = ei.match_cur; | ||
| (&mut ei.matches[match_cur]).push(Rc::new(MatchedNonterminal( | ||
| parse_nt(&mut rust_parser, span, &ident.name.as_str())))); | ||
| ei.idx += 1; | ||
| ei.match_cur += 1; | ||
| } else { | ||
| panic!() |
There was a problem hiding this comment.
nit: this panic should be unreachable (it might be better though to encapsulate this on the token tree somewhere, rather than doing it here.
There was a problem hiding this comment.
Changed to unreachable!().
|
r+ with the nit addressed |
jseyfried
force-pushed
the
fix_partially_consumed_tokens_in_macros
branch
from
71d4d24 to
95a9e2a
Compare
|
@bors r=nrc |
|
📌 Commit 95a9e2a has been approved by |
eddyb
added a commit
to eddyb/rust
that referenced
this pull request
Oct 19, 2016
…kens_in_macros, r=nrc macros: fix partially consumed tokens in macro matchers Fixes rust-lang#37175. This PR also avoids re-transcribing the tokens consumed by a matcher (and cloning the `TtReader` once per matcher), which improves expansion performance of the test case from rust-lang#34630 by ~8%. r? @nrc
eddyb
added a commit
to eddyb/rust
that referenced
this pull request
Oct 19, 2016
…kens_in_macros, r=nrc macros: fix partially consumed tokens in macro matchers Fixes rust-lang#37175. This PR also avoids re-transcribing the tokens consumed by a matcher (and cloning the `TtReader` once per matcher), which improves expansion performance of the test case from rust-lang#34630 by ~8%. r? @nrc
# for free
to join this conversation on GitHub.
Already have an account?
# to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #37175.
This PR also avoids re-transcribing the tokens consumed by a matcher (and cloning the
TtReaderonce per matcher), which improves expansion performance of the test case from #34630 by ~8%.r? @nrc