Dogfood more or_patterns in the compiler

[cuviper]

Another step toward the stabilization of or_patterns...

cc #54883 @Centril
r? @Mark-Simulacrum

[Mark-Simulacrum]

@bors r+

[bors]

📌 Commit e6482c87f380124207f16a60103f74646c52c541 has been approved by Mark-Simulacrum

[Dylan-DPC-zz]

failed in rollup

@bors r-

[bors]

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

[cuviper]

@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]

@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]

📌 Commit e6482c87f380124207f16a60103f74646c52c541 has been approved by Mark-Simulacrum

[Dylan-DPC-zz]

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

[Dylan-DPC-zz]

@bors p=1

[Mark-Simulacrum]

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

[Dylan-DPC-zz]

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

nevermind :D

[cuviper]

@bors r=Mark-Simulacrum

[bors]

📌 Commit 1d251291903788e0c005320e45370a81725a743a has been approved by Mark-Simulacrum

[bors]

⌛ Testing commit 1d251291903788e0c005320e45370a81725a743a with merge b07f26ee00acf5842ccdc54997fab4450a610bd9...

[bors]

💔 Test failed - checks-azure

[bors]

💔 Test failed - checks-azure

[cuviper]

Timeout installing msys...

@bors retry

[bors]

🔒 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:

1. git checkout rustc_or_patterns (switch to your branch)
2. git fetch upstream master (retrieve the latest master)
3. git rebase upstream/master -p (rebase on top of it)
4. Follow the on-screen instruction to resolve conflicts (check git status if you got lost).
5. 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]

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

[cuviper]

@bors r=Mark-Simulacrum

[bors]

📌 Commit 7b005c5 has been approved by Mark-Simulacrum

[bors]

⌛ Testing commit 7b005c5 with merge ad48d52...

[bors]

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