Point at original span when emitting unreachable lint #64592
Merged
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
Fixes rust-lang#64590 When we emit an 'unreachable' lint, we now add a note pointing at the expression that actually causes the code to be unreachable (e.g. `return`, `break`, `panic`). This is especially useful when macros are involved, since a diverging expression might be hidden inside of a macro invocation.
This comment has been minimized.
This comment has been minimized.
Aaron1011
commented
Sep 18, 2019
Centril
reviewed
Sep 18, 2019
|
r? @Centril |
This comment has been minimized.
This comment has been minimized.
Centril
reviewed
Sep 18, 2019
Co-Authored-By: Mazdak Farrokhzad <twingoow@gmail.com>
Rename the existing Diverges.always method to Diverges.is_always
This comment has been minimized.
This comment has been minimized.
Centril
reviewed
Sep 19, 2019
Co-Authored-By: Mazdak Farrokhzad <twingoow@gmail.com>
|
@Centril fixed |
|
👍 @bors r+ |
|
📌 Commit d67528f has been approved by |
Centril
added a commit
to Centril/rust
that referenced
this pull request
Sep 19, 2019
… r=Centril Point at original span when emitting unreachable lint Fixes rust-lang#64590 When we emit an 'unreachable' lint, we now add a note pointing at the expression that actually causes the code to be unreachable (e.g. `return`, `break`, `panic`). This is especially useful when macros are involved, since a diverging expression might be hidden inside of a macro invocation.
bors
added a commit
that referenced
this pull request
Sep 19, 2019
Rollup of 6 pull requests Successful merges: - #63448 (fix Miri discriminant handling) - #64592 (Point at original span when emitting unreachable lint) - #64601 (Fix backticks in documentation) - #64606 (Remove unnecessary `mut` in doc example) - #64611 (rustbuild: Don't package libstd twice) - #64613 (rustbuild: Copy crate doc files fewer times) Failed merges: r? @ghost
estebank
reviewed
Sep 19, 2019
| self.tcx().lint_hir(lint::builtin::UNREACHABLE_CODE, id, span, &msg); | ||
| let msg = format!("unreachable {}", kind); | ||
| self.tcx().struct_span_lint_hir(lint::builtin::UNREACHABLE_CODE, id, span, &msg) | ||
| .span_note( |
There was a problem hiding this comment.
Could you change this to be a span_label instead?
There was a problem hiding this comment.
Let's do it in a follow up since my rollup is running. :)
Also, @Aaron1011, can you look at @estebank's PR #64624 and close the relevant additional issues?
bors
added a commit
that referenced
this pull request
Sep 19, 2019
Rollup of 6 pull requests Successful merges: - #63448 (fix Miri discriminant handling) - #64592 (Point at original span when emitting unreachable lint) - #64601 (Fix backticks in documentation) - #64606 (Remove unnecessary `mut` in doc example) - #64611 (rustbuild: Don't package libstd twice) - #64613 (rustbuild: Copy crate doc files fewer times) Failed merges: r? @ghost
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.
Fix #39858, CC #46426, CC #57377, fix #60394, fix #64590.
When we emit an 'unreachable' lint, we now add a note pointing at the
expression that actually causes the code to be unreachable (e.g.
return,break,panic).This is especially useful when macros are involved, since a diverging
expression might be hidden inside of a macro invocation.