Dogfood more or_patterns in the compiler by cuviper · Pull Request #71231 · rust-lang/rust (original) (raw)
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 andprivacy statement. We’ll occasionally send you account related emails.
Already on GitHub?Sign in to your account
Conversation25 Commits1 Checks0 Files changed
Conversation
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
[ Show hidden characters]({{ revealButtonHref }})
📌 Commit e6482c87f380124207f16a60103f74646c52c541 has been approved by Mark-Simulacrum
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
failed in rollup
@bors r-
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
☔ The latest upstream changes (presumably #71049) made this pull request unmergeable. Please resolve the merge conflicts.
@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.)
@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+
📌 Commit e6482c87f380124207f16a60103f74646c52c541 has been approved by Mark-Simulacrum
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
No sorry, by failed I meant due to conflicts not due to the CI
(Well, actually, that approval is useless as this has conflicts, but that's fine. @cuviper feel free to approve as needed).
@Mark-Simulacrum there's a conflict in src/librustc_mir/interpret/intern.rs. Do you still want to r+? :P
nevermind :D
📌 Commit 1d251291903788e0c005320e45370a81725a743a has been approved by Mark-Simulacrum
⌛ Testing commit 1d251291903788e0c005320e45370a81725a743a with merge b07f26ee00acf5842ccdc54997fab4450a610bd9...
Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
label
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
Timeout installing msys...
@bors retry
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
🔒 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 statusif 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.
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
☔ The latest upstream changes (presumably #69793) made this pull request unmergeable. Please resolve the merge conflicts.
📌 Commit 7b005c5 has been approved by Mark-Simulacrum
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
This was referenced
Apr 19, 2020
Labels
This PR was explicitly merged by bors.
Status: Waiting on bors to run and complete tests. Bors will change the label on completion.