Remove hack for top-level or-patterns in match checking#66967
Merged
bors merged 8 commits intorust-lang:masterfrom Dec 3, 2019
Merged
Remove hack for top-level or-patterns in match checking#66967bors merged 8 commits intorust-lang:masterfrom
bors merged 8 commits intorust-lang:masterfrom
Conversation
The exact same logic was used in check_arms and check_match to build the matrix of relevant patterns. It would actually probably have been a bug if it was not the case, since exhaustiveness checking should be the same as checking reachability of an additional `_ => ...` match branch.
We want the lifetimes of the patterns contained in the matrix and the candidate `PatStack` to be the same so that they can be mixed together. A lot of this would not be necessary if `SmallVec` was covariant in its type argument (see servo/rust-smallvec#146).
rust-highfive
added
the
S-waiting-on-review
Contributor
|
The implementation looks good. Some of the pre-existing comments could do with a drive-by clean up (capitalisation, etc.), though I'm not too bothered. Let's just make sure this doesn't regress anything. @bors try @rust-timer queue |
Collaborator
|
Awaiting bors try build completion |
Collaborator
|
⌛ Trying commit 1c1bec2 with merge 057e49b53cffec15c0a8467b83fe961b5f476e83... |
Collaborator
|
☀️ Try build successful - checks-azure |
Collaborator
|
Queued 057e49b53cffec15c0a8467b83fe961b5f476e83 with parent 2da942f, future comparison URL. |
Collaborator
|
Finished benchmarking try commit 057e49b53cffec15c0a8467b83fe961b5f476e83, comparison URL. |
Contributor
|
@bors r+ |
Collaborator
|
📌 Commit 1c1bec2 has been approved by |
bors
added
S-waiting-on-bors
Contributor
|
@Nadrieril This looks great! Thanks a bunch for all the work you've been doing on match checking! |
Member
Author
|
I have to say I'm having a lot of fun doing it :D. And you all are really reactive and supportive too, thanks ! |
Centril
added a commit
to Centril/rust
that referenced
this pull request
Dec 3, 2019
Remove hack for top-level or-patterns in match checking Follow-up to rust-lang#66612. Or-patterns are now truly first-class in match checking. As a side-effect, redundant subpatterns are linted as such, making the `unreachable_patterns` lint a bit more general. cc rust-lang#54883 r? @varkor
Centril
added a commit
to Centril/rust
that referenced
this pull request
Dec 3, 2019
Remove hack for top-level or-patterns in match checking Follow-up to rust-lang#66612. Or-patterns are now truly first-class in match checking. As a side-effect, redundant subpatterns are linted as such, making the `unreachable_patterns` lint a bit more general. cc rust-lang#54883 r? @varkor
bors
added a commit
that referenced
this pull request
Dec 3, 2019
Rollup of 6 pull requests Successful merges: - #66148 (Show the sign for signed ops on `exact_div`) - #66651 (Add `enclosing scope` parameter to `rustc_on_unimplemented`) - #66904 (Adding docs for keyword match, move) - #66935 (syntax: Unify macro and attribute arguments in AST) - #66941 (Remove `ord` lang item) - #66967 (Remove hack for top-level or-patterns in match checking) Failed merges: r? @ghost
8 tasks
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
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.
Follow-up to #66612.
Or-patterns are now truly first-class in match checking. As a side-effect, redundant subpatterns are linted as such, making the
unreachable_patternslint a bit more general.cc #54883
r? @varkor