Handle $_ in mbe #6929
Merged
Handle $_ in mbe #6929
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
Member
Author
|
I'm pretty sure this isn't the right solution, though... |
lnicola
force-pushed
the
mbe-placeholders
branch
2 times, most recently
from
3171d61 to
3e17346
Compare
lnicola
commented
Dec 18, 2020
| fn expand_var(ctx: &mut ExpandCtx, v: &SmolStr) -> ExpandResult<Fragment> { | ||
| fn expand_var(ctx: &mut ExpandCtx, v: Option<&SmolStr>) -> ExpandResult<Fragment> { | ||
| let underscore = SmolStr::new_inline("_"); | ||
| let v = v.unwrap_or(&underscore); |
Member
Author
There was a problem hiding this comment.
This is all awkward because name: &'a SmolStr so we can't make a new one when needed.
Member
Author
|
And apparently |
Contributor
Yeah, I am pretty sure we didn't handle underscore as special case in mbe. So let me check what's happened in this week end? |
Contributor
|
Oh, I understand why now. We treat |
Contributor
|
If we have to make it to punct for parser, I recommend the following changes: Change to result.push(if k.is_punct() && k != UNDERSCORE {and Add: IDENT => make_leaf!(Ident),
UNDERSCORE => make_leaf!(Ident), // <---
k if k.is_keyword() => make_leaf!(Ident), |
lnicola
force-pushed
the
mbe-placeholders
branch
from
3e17346 to
75a26f6
Compare
Member
Author
|
Thanks for the pointers, that doesn't seem to break anything else. |
Contributor
|
LGTM, bors r+ |
Contributor
|
bors r+ |
Contributor
bors bot
added a commit
that referenced
this pull request
Dec 28, 2020
7059: Special case $_ in meta var instead of treat it as ident in mbe r=lnicola a=edwin0cheng In #6929, we treat '_' as an ident but rustc is only allow it in some special places (e.g. meta var in mbe , type, pat etc). This PR rollback that and we only make '$_' works in meta var matching. Fixes #7056 Co-authored-by: Edwin Cheng <edwin0cheng@gmail.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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 #6926