Skip to content

Explicitly checking for or-pattern before test - #78856

Merged
bors merged 3 commits into
rust-lang:masterfrom
mark-i-m:fix-or-pat-ice
Nov 15, 2020
Merged

Explicitly checking for or-pattern before test#78856
bors merged 3 commits into
rust-lang:masterfrom
mark-i-m:fix-or-pat-ice

Conversation

@mark-i-m

Copy link
Copy Markdown
Contributor

@rust-highfiverust-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.

@jyn514jyn514 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
Copy Markdown
ContributorAuthor

cc @matthewjasper

@mark-i-m
mark-i-mforce-pushed the fix-or-pat-ice branch 3 times, most recently from a656efb to db463c6CompareNovember 8, 2020 05:00
@mark-i-m

Copy link
Copy Markdown
ContributorAuthor

Looks ready for review :)

@varkorvarkor left a comment

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.

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

Comment threadcompiler/rustc_mir_build/src/build/matches/test.rs Outdated
@varkor

Copy link
Copy Markdown
Contributor

r? @matthewjasper

Comment threadsrc/test/ui/match/issue-72680.rs Outdated

@matthewjaspermatthewjasper left a comment

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.

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

Comment threadsrc/test/ui/match/issue-72680.rs Outdated
@matthewjasper

Copy link
Copy Markdown
Contributor

@bors r+

@bors

bors commented Nov 14, 2020

Copy link
Copy Markdown
Collaborator

📌 Commit 43e4783 has been approved by matthewjasper

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

Copy link
Copy Markdown
ContributorAuthor

@matthewjasper Nit addressed :) Good catch!

@matthewjasper

Copy link
Copy Markdown
Contributor

@bors r+

@bors

bors commented Nov 14, 2020

Copy link
Copy Markdown
Collaborator

📌 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:masterNov 15, 2020
@rustbotrustbot 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 freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

A-patternsRelating to patterns and pattern matchingF-or_patterns`#![feature(or_patterns)]`S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-compilerRelevant 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

@mark-i-m@varkor@matthewjasper@bors@WaffleLapkin@rust-highfive@jyn514@rustbot