parser: Simplify treatment of macro variables in Parser::bump #69211
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
rust-highfive added the S-waiting-on-review 
petrochenkov commented Feb 16, 2020
petrochenkov commented Feb 16, 2020
petrochenkov force-pushed the prevtok branch from 49b40f6 to 777d218 Compare 
| Added a couple more commits. |
12 tasks
Centril added S-waiting-on-author 
Token normalization is merged directly into `bump`. Special "unknown macro variable" diagnostic for unexpected `$`s is removed as preventing legal code from compiling.
They are always set synchronously with normalized tokens now
petrochenkov force-pushed the prevtok branch from 777d218 to 950845c Compare | Updated. |
petrochenkov added S-waiting-on-review 
| @bors r+ |
| 📌 Commit 950845c has been approved by |
bors added S-waiting-on-bors Centril added a commit to Centril/rust that referenced this pull request Feb 18, 2020
parser: Simplify treatment of macro variables in `Parser::bump` Follow-up to rust-lang#69006. Token normalization for `$ident` and `$lifetime` is merged directly into `bump`. Special "unknown macro variable" diagnostic for unexpected `$`s is removed as preventing legal code from compiling (as a result `bump` also doesn't call itself recursively anymore and can't make `prev_token` inconsistent). r? @Centril
bors added a commit that referenced this pull request Feb 18, 2020
Rollup of 6 pull requests Successful merges: - #69146 (Always const qualify literals by type) - #69159 (Select an appropriate unused lifetime name in suggestion) - #69194 (parse: fuse associated and extern items up to defaultness) - #69211 (parser: Simplify treatment of macro variables in `Parser::bump`) - #69217 (Do not emit note suggesting to implement operation trait to foreign type) - #69236 (parse: recover `mut (x @ y)` as `(mut x @ mut y)`.) Failed merges: r? @ghost
bors added a commit that referenced this pull request Mar 8, 2020
Centril added a commit to Centril/rust that referenced this pull request Mar 9, 2020
rustc_parse: Remove `Parser::normalized(_prev)_token` Perform the "normalization" (renamed to "uninterpolation") on the fly when necessary. The final part of rust-lang#69579 rust-lang#69384 rust-lang#69376 rust-lang#69211 rust-lang#69034 rust-lang#69006. r? @Centril
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
4 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.
Follow-up to #69006.
Token normalization for
$identand$lifetimeis merged directly intobump.Special "unknown macro variable" diagnostic for unexpected
$s is removed as preventing legal code from compiling (as a resultbumpalso doesn't call itself recursively anymore and can't makeprev_tokeninconsistent).r? @Centril