Improve diagnostics and code for exhaustiveness of empty matches #67026
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
This is logically equivalent to the previous code.
Actually empty matches are still handled by a different code path
This uses the exact same code path that would be used for
`match x { _ if false => {} }`, since in both cases the resulting matrix
is empty. Since we think the behaviour in that case is ok, then we can
remove the special case and use the default code path.
When the feature is on, the special casing is not needed. That way when we stabilize the feature this `if` can just be removed.
|
r? @varkor (rust_highfive has picked a reviewer for you, use r? to override) |
rust-highfive
added
the
S-waiting-on-review
varkor
suggested changes
Dec 4, 2019
Centril
reviewed
Dec 5, 2019
Centril
added
S-waiting-on-author
Centril
approved these changes
Dec 11, 2019
estebank
reviewed
Dec 11, 2019
estebank
reviewed
Dec 11, 2019
| @@ -9,6 +9,9 @@ LL | let _ = match x { | |||
| error[E0004]: non-exhaustive patterns: type `&Void` is non-empty | |||
| --> $DIR/uninhabited-matches-feature-gated.rs:12:19 | |||
| | | |||
| LL | enum Void {} | |||
| | ------------ `Void` defined here | |||
| ... | |||
| LL | let _ = match x {}; | |||
There was a problem hiding this comment.
I think we might want a special note for ! types.
|
Letting @varkor give final stamp, but +1 from me. |
|
@bors r=varkor,Centril,estebank |
|
📌 Commit fbd2cd0 has been approved by |
bors
added
S-waiting-on-bors
|
⌛ Testing commit fbd2cd0 with merge a8d1fbfe9401db1c3d3debf889f0c915b92ad61c... |
|
The job Click to expand the log.I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact |
|
💔 Test failed - checks-azure |
bors
added
S-waiting-on-review
|
@bors retry seems spurious cc @alexcrichton @sfackler could you take a look at what is happening with the spurious issue? |
bors
added
S-waiting-on-bors
Centril
added a commit
to Centril/rust
that referenced
this pull request
Dec 13, 2019
… r=varkor,Centril,estebank Improve diagnostics and code for exhaustiveness of empty matches There was a completely separate check and diagnostics for the case of an empty match. This led to slightly different error messages and duplicated code. This improves code reuse and generally clarifies what happens for empty matches. This also clarifies the action of the `exhaustive_patterns` feature, and ensures that this feature doesn't change diagnostics in places it doesn't need to.
bors
added a commit
that referenced
this pull request
Dec 13, 2019
Rollup of 7 pull requests Successful merges: - #67026 (Improve diagnostics and code for exhaustiveness of empty matches) - #67235 (VecDeque: drop remaining items on destructor panic) - #67254 (dont ICE in case of invalid drop fn) - #67256 (Reduce allocs for validation errors) - #67274 (be explicit that mem::uninitialized is the same as MaybeUninit::uninit().assume_init()) - #67278 (`coerce_inner`: use initial `expected_ty`) - #67280 (docs: std::convert::From: Fix typo) Failed merges: r? @ghost
Nadrieril
added
the
A-exhaustiveness-checking
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.
There was a completely separate check and diagnostics for the case of an empty match. This led to slightly different error messages and duplicated code.
This improves code reuse and generally clarifies what happens for empty matches. This also clarifies the action of the
exhaustive_patternsfeature, and ensures that this feature doesn't change diagnostics in places it doesn't need to.