Fix ICE when misplaced visibility cannot be properly parsed #86932
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
This comment has been minimized.
This comment has been minimized.
|
@bors r+ I want to rework this part of the parser to handle incorrect code more gracefully, but for now this is fine. |
|
📌 Commit 04a9c10 has been approved by |
bors
added
S-waiting-on-bors
estebank
reviewed
Jul 7, 2021
Comment on lines
+1794
to
+1800
| let vis = match self.parse_visibility(FollowedByType::No) { | ||
| Ok(v) => v, | ||
| Err(mut d) => { | ||
| d.cancel(); | ||
| return Err(err); | ||
| } | ||
| }; |
There was a problem hiding this comment.
This kind of code is quite common, it'd be nice if we had some helper for it 🤔
JohnTitor
added a commit
to JohnTitor/rust
that referenced
this pull request
Jul 7, 2021
Fix ICE when misplaced visibility cannot be properly parsed Fixes rust-lang#86895 The issue was that a failure to parse the visibility was causing the original error to be dropped before being emitted. The resulting error isn't quite as nice as when the visibility is parsed properly, but I'm not sure which error to prioritize here. Displaying both errors might be too confusing. r? `@estebank`
JohnTitor
added a commit
to JohnTitor/rust
that referenced
this pull request
Jul 7, 2021
Fix ICE when misplaced visibility cannot be properly parsed Fixes rust-lang#86895 The issue was that a failure to parse the visibility was causing the original error to be dropped before being emitted. The resulting error isn't quite as nice as when the visibility is parsed properly, but I'm not sure which error to prioritize here. Displaying both errors might be too confusing. r? ``@estebank``
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jul 8, 2021
Rollup of 9 pull requests Successful merges: - rust-lang#86639 (Support lint tool names in rustc command line options) - rust-lang#86812 (Recover from `&dyn mut ...` parse errors) - rust-lang#86917 (Add doc comment for `impl From<LayoutError> for TryReserveError`) - rust-lang#86925 (Add self to mailmap) - rust-lang#86927 (Sync rustc_codegen_cranelift) - rust-lang#86932 (Fix ICE when misplaced visibility cannot be properly parsed) - rust-lang#86933 (Clean up rustdoc static files) - rust-lang#86955 (Fix typo in `ops::Drop` docs) - rust-lang#86956 (Revert "Add "every" as a doc alias for "all".") Failed merges: 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.
Fixes #86895
The issue was that a failure to parse the visibility was causing the original error to be dropped before being emitted.
The resulting error isn't quite as nice as when the visibility is parsed properly, but I'm not sure which error to prioritize here. Displaying both errors might be too confusing.
r? @estebank