Do not recover from Ty? in macro parsing
#94593
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
Follow up to rust-lang#92746. Address rust-lang#94510.
rustbot
added
the
T-compiler
|
r? @lcnr (rust-highfive has picked a reviewer for you, use r? to override) |
rust-highfive
added
the
S-waiting-on-review
estebank
added
beta-nominated
davidtwco
approved these changes
Mar 4, 2022
davidtwco
approved these changes
Mar 4, 2022
|
r? @davidtwco @bors r+ rollup |
|
📌 Commit 004f2ed has been approved by |
bors
added
S-waiting-on-bors
Dylan-DPC
added a commit
to Dylan-DPC/rust
that referenced
this pull request
Mar 4, 2022
Do not recover from `Ty?` in macro parsing Follow up to rust-lang#92746. Address rust-lang#94510.
Dylan-DPC
added a commit
to Dylan-DPC/rust
that referenced
this pull request
Mar 4, 2022
Do not recover from `Ty?` in macro parsing Follow up to rust-lang#92746. Address rust-lang#94510.
Dylan-DPC
added a commit
to Dylan-DPC/rust
that referenced
this pull request
Mar 4, 2022
Do not recover from `Ty?` in macro parsing Follow up to rust-lang#92746. Address rust-lang#94510.
Dylan-DPC
added a commit
to Dylan-DPC/rust
that referenced
this pull request
Mar 4, 2022
Do not recover from `Ty?` in macro parsing Follow up to rust-lang#92746. Address rust-lang#94510.
Dylan-DPC
added a commit
to Dylan-DPC/rust
that referenced
this pull request
Mar 4, 2022
Do not recover from `Ty?` in macro parsing Follow up to rust-lang#92746. Address rust-lang#94510.
Dylan-DPC
added a commit
to Dylan-DPC/rust
that referenced
this pull request
Mar 4, 2022
Do not recover from `Ty?` in macro parsing Follow up to rust-lang#92746. Address rust-lang#94510.
Dylan-DPC
added a commit
to Dylan-DPC/rust
that referenced
this pull request
Mar 4, 2022
Do not recover from `Ty?` in macro parsing Follow up to rust-lang#92746. Address rust-lang#94510.
matthiaskrgr
added a commit
to matthiaskrgr/rust
that referenced
this pull request
Mar 4, 2022
Do not recover from `Ty?` in macro parsing Follow up to rust-lang#92746. Address rust-lang#94510.
Dylan-DPC
added a commit
to Dylan-DPC/rust
that referenced
this pull request
Mar 4, 2022
Do not recover from `Ty?` in macro parsing Follow up to rust-lang#92746. Address rust-lang#94510.
estebank
commented
Mar 4, 2022
| @@ -305,7 +317,7 @@ impl<'a> Parser<'a> { | |||
| // Try to recover from use of `+` with incorrect priority. | |||
| self.maybe_report_ambiguous_plus(allow_plus, impl_dyn_multi, &ty); | |||
| self.maybe_recover_from_bad_type_plus(allow_plus, &ty)?; | |||
| let ty = self.maybe_recover_from_question_mark(ty, is_as_cast); | |||
| let ty = self.maybe_recover_from_question_mark(ty, recover_question_mark); | |||
There was a problem hiding this comment.
If further problems are encountered in the future, then the appropriate change will be to change this to return the specific Err() instead of allowing successful subsequent parses. That'd be a shame, but it'd be a straightforward change (and don't envision it being a problem anywhere else other than exprs and macros, which are now both handled).
estebank
added
the
T-compiler
rustbot
added
the
beta-accepted
cuviper
removed
the
beta-nominated
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Mar 18, 2022
[beta] backports + bootstrap bump Add pending backports: * Revert accidental stabilization rust-lang#94805 * Do not recover from Ty? in macro parsing rust-lang#94593 * Fix cmake build. rust-lang#95050 And updates the bootstrap compiler to 1.59.0.
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 #92746. Address #94510.