Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Explicitly checking for or-pattern before test #78856

Merged
merged 3 commits into from
Nov 15, 2020

Conversation

mark-i-m
Copy link
Member

@mark-i-m mark-i-m commented Nov 7, 2020

Fixes #72680

cc #54883

r? @varkor

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Nov 7, 2020
@mark-i-m

This comment has been minimized.

@jyn514 jyn514 added A-patterns Relating to patterns and pattern matching F-or_patterns `#![feature(or_patterns)]` T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Nov 7, 2020
@mark-i-m
Copy link
Member Author

mark-i-m commented Nov 7, 2020

cc @matthewjasper

@mark-i-m mark-i-m force-pushed the fix-or-pat-ice branch 3 times, most recently from a656efb to db463c6 Compare November 8, 2020 05:00
@mark-i-m
Copy link
Member Author

mark-i-m commented Nov 8, 2020

Looks ready for review :)

Copy link
Member

@varkor varkor left a comment

Choose a reason for hiding this comment

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

It's been a while since I dealt with this code, so I'd rather @matthewjasper took a look.

compiler/rustc_mir_build/src/build/matches/test.rs Outdated Show resolved Hide resolved
@varkor
Copy link
Member

varkor commented Nov 8, 2020

r? @matthewjasper

@rust-highfive rust-highfive assigned matthewjasper and unassigned varkor Nov 8, 2020
Copy link
Contributor

@matthewjasper matthewjasper left a comment

Choose a reason for hiding this comment

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

One style nit that would be nice to have fixed before this is merged

src/test/ui/match/issue-72680.rs Outdated Show resolved Hide resolved
@matthewjasper
Copy link
Contributor

@bors r+

@bors
Copy link
Contributor

bors commented Nov 14, 2020

📌 Commit 43e4783 has been approved by matthewjasper

@bors bors 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 Nov 14, 2020
Co-authored-by: matthewjasper <20113453+matthewjasper@users.noreply.github.com>
@mark-i-m
Copy link
Member Author

@matthewjasper Nit addressed :) Good catch!

@matthewjasper
Copy link
Contributor

@bors r+

@bors
Copy link
Contributor

bors commented Nov 14, 2020

📌 Commit b825ae7 has been approved by matthewjasper

bors added a commit to rust-lang-ci/rust that referenced this pull request Nov 15, 2020
Rollup of 15 pull requests

Successful merges:

 - rust-lang#78352 (Do not call `unwrap` with `signatures` option enabled)
 - rust-lang#78590 (refactor: removing alloc::collections::vec_deque ignore-tidy-filelength)
 - rust-lang#78848 (Bump minimal supported LLVM version to 9)
 - rust-lang#78856 (Explicitly checking for or-pattern before test)
 - rust-lang#78948 (test: add `()=()=()=...` to weird-exprs.rs)
 - rust-lang#78962 (Add a test for r# identifiers)
 - rust-lang#78963 (Added some unit tests as requested)
 - rust-lang#78966 (Never inline C variadics, cold functions, functions with incompatible attributes ...)
 - rust-lang#78968 (Include llvm-as in llvm-tools-preview component)
 - rust-lang#78969 (Normalize function type during validation)
 - rust-lang#78980 (Fix rustc_ast_pretty print_qpath resulting in invalid macro input)
 - rust-lang#78986 (Avoid installing external LLVM dylibs)
 - rust-lang#78988 (Fix an intrinsic invocation on threaded wasm)
 - rust-lang#78993 (rustc_target: Fix dash vs underscore mismatches in option names)
 - rust-lang#79013 (Clean up outdated `use_once_payload` pretty printer comment)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit a29b68f into rust-lang:master Nov 15, 2020
@rustbot rustbot added this to the 1.50.0 milestone Nov 15, 2020
@mark-i-m mark-i-m deleted the fix-or-pat-ice branch November 15, 2020 04:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-patterns Relating to patterns and pattern matching F-or_patterns `#![feature(or_patterns)]` S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

"or-patterns should have already been handled" when using feature(or_patterns)
8 participants