Skip to content

Point at original span when emitting unreachable lint - #64592

Merged
bors merged 8 commits into
rust-lang:masterfrom
Aaron1011:feature/unreachable-span
Sep 20, 2019
Merged

Point at original span when emitting unreachable lint#64592
bors merged 8 commits into
rust-lang:masterfrom
Aaron1011:feature/unreachable-span

Conversation

@Aaron1011

@Aaron1011Aaron1011 commented Sep 18, 2019•
edited by estebank
Loading

Copy link
Copy Markdown
Contributor

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.

@Aaron1011
Point at original span when emitting unreachable lint
822393d
Fixesrust-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.
@rust-highfive

This comment has been minimized.

Sign in to view
@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Sep 18, 2019
Aaron1011
Aaron1011 commented Sep 18, 2019
View reviewed changes
Comment threadsrc/test/ui/reachable/expr_match.stderr
Centril
Centril reviewed Sep 18, 2019
View reviewed changes
Comment threadsrc/librustc_typeck/check/mod.rs Outdated
Comment threadsrc/librustc_typeck/check/mod.rs Outdated
Comment threadsrc/test/ui/reachable/expr_match.stderr
Comment threadsrc/test/ui/reachable/expr_return_in_macro.rs Outdated
@Centril

Centril commented Sep 18, 2019

Copy link
Copy Markdown
Contributor

r? @Centril

@Aaron1011

This comment has been minimized.

Sign in to view
Centril
Centril reviewed Sep 18, 2019
View reviewed changes
Comment threadsrc/librustc_typeck/check/_match.rs Outdated
Comment threadsrc/librustc_typeck/check/_match.rs Outdated
Comment threadsrc/librustc_typeck/check/_match.rs Outdated
Comment threadsrc/librustc_typeck/check/_match.rs Outdated
Comment threadsrc/librustc_typeck/check/_match.rs Outdated
Comment threadsrc/librustc_typeck/check/mod.rs Outdated
Comment threadsrc/librustc_typeck/check/mod.rs Outdated
Comment threadsrc/librustc_typeck/check/mod.rs Outdated
Comment threadsrc/librustc_typeck/check/mod.rs Outdated
Comment threadsrc/librustc_typeck/check/mod.rs Outdated
Aaron1011and others added 3 commits September 18, 2019 19:48
@Aaron1011@Centril
Apply formatting fixes
6edcfbe
Co-Authored-By: Mazdak Farrokhzad <twingoow@gmail.com>
@Aaron1011
Introduce Diverges::always constructor
a8ce93e
Rename the existing Diverges.always method to Diverges.is_always
@Aaron1011
Use 'if let' instead of 'match'
41e1128
@Aaron1011

This comment has been minimized.

Sign in to view
Centril
Centril reviewed Sep 19, 2019
View reviewed changes
Comment threadsrc/librustc_typeck/check/mod.rs Outdated
Aaron1011and others added 2 commits September 18, 2019 20:14
@Aaron1011@Centril
Another formatting fix
034a8fd
Co-Authored-By: Mazdak Farrokhzad <twingoow@gmail.com>
@Aaron1011
Merge inherent impl blocks for `Diverges
d67528f
@Aaron1011

Aaron1011 commented Sep 19, 2019

Copy link
Copy Markdown
ContributorAuthor

@Centril fixed

@Centril

Centril commented Sep 19, 2019

Copy link
Copy Markdown
Contributor

👍 @bors r+

@bors

bors commented Sep 19, 2019

Copy link
Copy Markdown
Collaborator

📌 Commit d67528f has been approved by Centril

@borsbors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Sep 19, 2019
Centril added a commit to Centril/rust that referenced this pull request Sep 19, 2019
@Centril
Rollup merge ofrust-lang#64592- Aaron1011:feature/unreachable-span,…
3c28682
… r=Centril
Point at original span when emitting unreachable lint
Fixesrust-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.
@CentrilCentril mentioned this pull request Sep 19, 2019
Merged
bors added a commit that referenced this pull request Sep 19, 2019
@bors
Auto merge of#64616- Centril:rollup-du6728f, r=Centril
3a302cd
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
@CentrilCentril mentioned this pull request Sep 19, 2019
Closed
estebank
estebank reviewed Sep 19, 2019
View reviewed changes
Comment threadsrc/librustc_typeck/check/mod.rs
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(

@estebankestebankSep 19, 2019

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you change this to be a span_label instead?

@CentrilCentrilSep 19, 2019

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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
@bors
Auto merge of#64616- Centril:rollup-du6728f, r=Centril
53b352e
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
@bors
bors merged commit d67528f into rust-lang:masterSep 20, 2019
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@estebankestebankestebank left review comments
+1 more reviewer
@CentrilCentrilCentril left review comments
Reviewers whose approvals may not affect merge requirements

Assignees

@CentrilCentril

Labels

S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.

Projects

None yet

Milestone

No milestone

6 participants

@Aaron1011@rust-highfive@Centril@bors@estebank@cramertj