Uh oh!
There was an error while loading. Please reload this page.
Move collect_and_partition_mono_items to rustc_mir - #55349
Conversation
rust-highfive
commented
Oct 25, 2018
r? @oli-obk (rust_highfive has picked a reviewer for you, use r? to override) |
Uh oh!
There was an error while loading. Please reload this page.
oli-obk
commented
Oct 25, 2018
@bors r+ |
bors
commented
Oct 25, 2018
📌 Commit adafd0f has been approved by |
bjorn3
commented
Oct 25, 2018
Should I close #55225? |
oli-obk
commented
Oct 25, 2018
idk what the rules are. These PRs are probably going to get rolled up anyway |
bjorn3
commented
Oct 25, 2018
Will close it, so that the first commit doesn't get included twice (that commit is a rebase of the other pr) |
…ion_mono_items, r=oli-obk Move collect_and_partition_mono_items to rustc_mir Most of the logic of it is inside rustc_mir anyway. Also removes the single function crate rustc_metadata_utils. Based on rust-lang#55225
bors
commented
Nov 3, 2018
🔒 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
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 Sometimes step 4 will complete without asking for resolution. This is usually due to difference between how Error message |
bors
commented
Nov 3, 2018
☔ The latest upstream changes (presumably #55238) made this pull request unmergeable. Please resolve the merge conflicts. |
adafd0f to
c859919Comparebjorn3
commented
Nov 3, 2018
Rebased |
Co-Authored-By: bjorn3 <bjorn3@users.noreply.github.com>
oli-obk
commented
Nov 4, 2018
@bors r+ |
bors
commented
Nov 4, 2018
📌 Commit 9e479c2 has been approved by |
bors
commented
Nov 4, 2018
…ems, r=oli-obk Move collect_and_partition_mono_items to rustc_mir Most of the logic of it is inside rustc_mir anyway. Also removes the single function crate rustc_metadata_utils. Based on #55225
bors
commented
Nov 4, 2018
☀️ Test successful - status-appveyor, status-travis |
Most of the logic of it is inside rustc_mir anyway.
Also removes the single function crate rustc_metadata_utils. Based on #55225