Do not recover when parsing stmt in cfg-eval. #111054
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
|
r? @lcnr (rustbot has picked a reviewer for you, use r? to override) |
rustbot
added
S-waiting-on-review
|
r? compiler |
b-naber
reviewed
May 7, 2023
| @@ -166,7 +166,9 @@ impl CfgEval<'_, '_> { | |||
| )) | |||
| }, | |||
| Annotatable::Stmt(_) => |parser| { | |||
| Ok(Annotatable::Stmt(P(parser.parse_stmt(ForceCollect::Yes)?.unwrap()))) | |||
| Ok(Annotatable::Stmt(P(parser | |||
| .parse_stmt_without_recovery(false, ForceCollect::Yes)? | |||
There was a problem hiding this comment.
Not that familiar with the macro expansion code, so feel free to re-assign.
But I'm wondering why we even get into the expand call if the parse for the Annotatable failed in the first place. If I understand this correctly this parse is a re-parse (we also get a duplicated error message in the test). Why can't we prevent this to be called when the first parse failed?
|
@bors r+ rollup |
bors
added
S-waiting-on-bors
Dylan-DPC
added a commit
to Dylan-DPC/rust
that referenced
this pull request
May 18, 2023
Do not recover when parsing stmt in cfg-eval. `parse_stmt` does recovery on its own. When parsing the statement fails, we always get `Ok(None)` instead of an `Err` variant with the diagnostic that we can emit. To avoid this behaviour, we need to opt-out of recovery for cfg_eval. Fixes rust-lang#105228
This was referenced May 18, 2023
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
May 18, 2023
Rollup of 7 pull requests Successful merges: - rust-lang#110986 (Delay a bug when overwriting fed value.) - rust-lang#111054 (Do not recover when parsing stmt in cfg-eval.) - rust-lang#111685 (Fix typo in bootstrap command description) - rust-lang#111686 (Retire is_foreign_item query.) - rust-lang#111695 (Exclude inherent projections from some alias type `match`es) - rust-lang#111703 (Merge query property modules into one) - rust-lang#111707 (Remove unused `impl<T> WorkerLocal<Vec<T>>`.) r? `@ghost` `@rustbot` modify labels: rollup
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.
parse_stmtdoes recovery on its own. When parsing the statement fails, we always getOk(None)instead of anErrvariant with the diagnostic that we can emit.To avoid this behaviour, we need to opt-out of recovery for cfg_eval.
Fixes #105228