Dogfood more or_patterns in the compiler #71231

cuviper · 2020-04-17T01:06:57Z

Another step toward the stabilization of or_patterns...

cc #54883 @Centril
r? @Mark-Simulacrum

Mark-Simulacrum · 2020-04-17T01:21:33Z

@bors r+

bors · 2020-04-17T01:21:34Z

📌 Commit e6482c87f380124207f16a60103f74646c52c541 has been approved by Mark-Simulacrum

Dylan-DPC-zz · 2020-04-17T15:05:34Z

failed in rollup

@bors r-

bors · 2020-04-17T15:17:09Z

☔ The latest upstream changes (presumably #71049) made this pull request unmergeable. Please resolve the merge conflicts.

cuviper · 2020-04-17T15:22:47Z

@Dylan-DPC was that failed as in broke some functionality? Or simply failed to merge -- since this touches a lot of code, conflicts are somewhat likely.

(And now @bors reports a merge conflict anyway, so I'll fix that.)

Mark-Simulacrum · 2020-04-17T15:24:13Z

@bors rollup=never

It looks like it just didn't merge (which is expected), this touches a lot of code. Marking as not rolling up.

@bors r+

bors · 2020-04-17T15:24:15Z

📌 Commit e6482c87f380124207f16a60103f74646c52c541 has been approved by Mark-Simulacrum

Dylan-DPC-zz · 2020-04-17T15:24:17Z

No sorry, by failed I meant due to conflicts not due to the CI

Dylan-DPC-zz · 2020-04-17T15:24:28Z

@bors p=1

Mark-Simulacrum · 2020-04-17T15:24:58Z

(Well, actually, that approval is useless as this has conflicts, but that's fine. @cuviper feel free to approve as needed).

Dylan-DPC-zz · 2020-04-17T15:25:08Z

~~@Mark-Simulacrum there's a conflict in src/librustc_mir/interpret/intern.rs. Do you still want to r+? :P~~

nevermind :D

cuviper · 2020-04-17T17:23:33Z

@bors r=Mark-Simulacrum

bors · 2020-04-17T17:23:34Z

📌 Commit 1d251291903788e0c005320e45370a81725a743a has been approved by Mark-Simulacrum

bors · 2020-04-18T11:01:52Z

⌛ Testing commit 1d251291903788e0c005320e45370a81725a743a with merge b07f26ee00acf5842ccdc54997fab4450a610bd9...

bors · 2020-04-18T11:04:38Z

💔 Test failed - checks-azure

bors · 2020-04-19T06:42:45Z

💔 Test failed - checks-azure

cuviper · 2020-04-19T06:46:36Z

Timeout installing msys...

@bors retry

bors · 2020-04-19T10:01:12Z

🔒 Merge conflict

This pull request and the master branch diverged in a way that cannot be automatically merged. Please rebase on top of the latest master branch, and let the reviewer approve again.

How do I rebase?

Assuming self is your fork and upstream is this repository, you can resolve the conflict following these steps:

git checkout rustc_or_patterns (switch to your branch)
git fetch upstream master (retrieve the latest master)
git rebase upstream/master -p (rebase on top of it)
Follow the on-screen instruction to resolve conflicts (check git status if you got lost).
git push self rustc_or_patterns --force-with-lease (update this PR)

You may also read Git Rebasing to Resolve Conflicts by Drew Blessing for a short tutorial.

Please avoid the "Resolve conflicts" button on GitHub. It uses git merge instead of git rebase which makes the PR commit history more difficult to read.

Sometimes step 4 will complete without asking for resolution. This is usually due to difference between how Cargo.lock conflict is handled during merge and rebase. This is normal, and you should still perform step 5 to update this PR.

Error message

Auto-merging src/librustc_typeck/astconv.rs
Auto-merging src/librustc_trait_selection/traits/wf.rs
CONFLICT (content): Merge conflict in src/librustc_trait_selection/traits/wf.rs
Auto-merging src/librustc_trait_selection/traits/error_reporting/suggestions.rs
Auto-merging src/librustc_session/config.rs
Auto-merging src/librustc_passes/check_const.rs
Auto-merging src/librustc_parse/parser/diagnostics.rs
Auto-merging src/librustc_mir/util/pretty.rs
Auto-merging src/librustc_mir/borrow_check/diagnostics/region_name.rs
Auto-merging src/librustc_codegen_llvm/attributes.rs
Auto-merging src/librustc_ast/lib.rs
Automatic merge failed; fix conflicts and then commit the result.

bors · 2020-04-19T10:01:45Z

☔ The latest upstream changes (presumably #69793) made this pull request unmergeable. Please resolve the merge conflicts.

cuviper · 2020-04-19T15:12:42Z

@bors r=Mark-Simulacrum

bors · 2020-04-19T15:12:43Z

📌 Commit 7b005c5 has been approved by Mark-Simulacrum

bors · 2020-04-19T16:43:07Z

⌛ Testing commit 7b005c5 with merge ad48d52...

bors · 2020-04-19T19:53:35Z

☀️ Test successful - checks-azure
Approved by: Mark-Simulacrum
Pushing ad48d52 to master...

rust-highfive assigned Mark-Simulacrum Apr 17, 2020

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Apr 17, 2020

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 Apr 17, 2020

Dylan-DPC-zz mentioned this pull request Apr 17, 2020

Rollup of 4 pull requests #71245

Closed

bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Apr 17, 2020

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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Apr 17, 2020

cuviper force-pushed the rustc_or_patterns branch from e6482c8 to 1d25129 Compare April 17, 2020 17:22

bors removed the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Apr 18, 2020

bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Apr 19, 2020

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 Apr 19, 2020

bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Apr 19, 2020

Dogfood more or_patterns in the compiler

7b005c5

cuviper force-pushed the rustc_or_patterns branch from 1d25129 to 7b005c5 Compare April 19, 2020 14:34

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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Apr 19, 2020

bors added the merged-by-bors This PR was explicitly merged by bors. label Apr 19, 2020

bors merged commit ad48d52 into rust-lang:master Apr 19, 2020

cuviper deleted the rustc_or_patterns branch May 30, 2020 21:55

Centril mentioned this pull request Jun 30, 2020

Tracking issue for RFC 2535, 2530, 2175, "Or patterns, i.e Foo(Bar(x) | Baz(x))" #54883

Closed

8 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Dogfood more or_patterns in the compiler #71231

Dogfood more or_patterns in the compiler #71231

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Dogfood more or_patterns in the compiler #71231

Dogfood more or_patterns in the compiler #71231

Uh oh!

Conversation

Uh oh!

Uh oh!

Uh oh!

Uh oh!