parser: Remove Parser::prev_span
#69579
Merged
Conversation
This file contains 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
Centril
reviewed
Feb 29, 2020
Comment on lines
1682
to
1689
| if self.eat_keyword(kw::Catch) { | ||
| let mut error = | ||
| self.struct_span_err(self.prev_span, "keyword `catch` cannot follow a `try` block"); | ||
| let mut error = self.struct_span_err( | ||
| self.prev_token.span, | ||
| "keyword `catch` cannot follow a `try` block", | ||
| ); | ||
| error.help("try using `match` on the result of the `try` block instead"); | ||
| error.emit(); | ||
| Err(error) |
There was a problem hiding this comment.
Maybe we should improve recovery here? (Not in this PR)
| @@ -568,7 +568,7 @@ impl<'a> Parser<'a> { | |||
| && self.look_ahead(1, |t| t.is_non_raw_ident_where(|i| i.name != kw::As)) | |||
| { | |||
| self.bump(); // `default` | |||
| Defaultness::Default(self.prev_span) | |||
| Defaultness::Default(self.normalized_prev_token.span) | |||
There was a problem hiding this comment.
This is because of the is_non_raw_ident_where?
There was a problem hiding this comment.
No, because default is an identifier.
It's more important for async which performs an edition check on the span, but I used normalization for all enum Foo { Yes(Span), No } keywords for consistency.
| } | ||
|
|
||
| /// Parses constness: `const` or nothing. | ||
| fn parse_constness(&mut self) -> Const { | ||
| if self.eat_keyword(kw::Const) { Const::Yes(self.prev_span) } else { Const::No } | ||
| if self.eat_keyword(kw::Const) { | ||
| Const::Yes(self.normalized_prev_token.span) |
There was a problem hiding this comment.
And this is also because of eat_keyword dealing with identifiers? Although check_keyword doesn't seem to be using normalized_token... but normalization does happens automatically in bump_with.
There was a problem hiding this comment.
Same answer as in #69579 (comment), const is an identifier.
eat_keyword works correctly because it uses token.ident() internally which uses normalization.
|
@bors r+ |
|
📌 Commit 7de9a72 has been approved by |
bors
added
S-waiting-on-bors
bors
added a commit
that referenced
this pull request
Mar 1, 2020
Rollup of 7 pull requests Successful merges: - #69397 (bootstrap: Remove commit hash from LLVM version suffix to avoid rebuilds) - #69549 (Improve MinGW detection when cross compiling ) - #69562 (Don't `bug` when taking discriminant of generator during dataflow) - #69579 (parser: Remove `Parser::prev_span`) - #69580 (use .copied() instead of .map(|x| *x) on iterators) - #69583 (Do not ICE on invalid type node after parse recovery) - #69605 (Use `opt_def_id()` over `def_id()`) Failed merges: r? @ghost
JohnTitor
added a commit
to JohnTitor/rust-clippy
that referenced
this pull request
Mar 1, 2020
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
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 #69384.
r? @Centril