Skip to content
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 and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move collect_and_partition_mono_items to rustc_mir #55349

Merged

Conversation

bjorn3
Copy link
Member

@bjorn3 bjorn3 commented Oct 25, 2018

Most of the logic of it is inside rustc_mir anyway.

Also removes the single function crate rustc_metadata_utils. Based on #55225

@rust-highfive
Copy link
Collaborator

r? @oli-obk

(rust_highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 25, 2018
Copy link
Contributor

@oli-obk oli-obk left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

r=me with nit fixed

src/librustc_mir/monomorphize/partitioning.rs Outdated Show resolved Hide resolved
@oli-obk
Copy link
Contributor

oli-obk commented Oct 25, 2018

@bors r+

@bors
Copy link
Contributor

bors commented Oct 25, 2018

📌 Commit adafd0f has been approved by oli-obk

@bors 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 Oct 25, 2018
@bjorn3
Copy link
Member Author

bjorn3 commented Oct 25, 2018

Should I close #55225?

@oli-obk
Copy link
Contributor

oli-obk commented Oct 25, 2018

idk what the rules are. These PRs are probably going to get rolled up anyway

@bjorn3
Copy link
Member Author

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)

Mark-Simulacrum added a commit to Mark-Simulacrum/rust that referenced this pull request Oct 27, 2018
…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
Copy link
Contributor

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 self is your fork and upstream is this repository, you can resolve the conflict following these steps:

  1. git checkout rustc_mir_collect_and_partition_mono_items (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_mir_collect_and_partition_mono_items --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
warning: Cannot merge binary files: src/Cargo.lock (HEAD vs. heads/homu-tmp)
Auto-merging src/librustc_mir/monomorphize/partitioning.rs
Auto-merging src/librustc_mir/lib.rs
Removing src/librustc_metadata_utils/lib.rs
Removing src/librustc_metadata_utils/Cargo.toml
Auto-merging src/librustc_codegen_utils/symbol_export.rs
Auto-merging src/librustc_codegen_utils/linker.rs
Auto-merging src/librustc_codegen_utils/link.rs
Auto-merging src/librustc_codegen_llvm/base.rs
Auto-merging src/Cargo.lock
CONFLICT (content): Merge conflict in src/Cargo.lock
Automatic merge failed; fix conflicts and then commit the result.

@bors 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 Nov 3, 2018
@bors
Copy link
Contributor

bors commented Nov 3, 2018

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

@bjorn3 bjorn3 force-pushed the rustc_mir_collect_and_partition_mono_items branch from adafd0f to c859919 Compare November 3, 2018 13:32
@bjorn3
Copy link
Member Author

bjorn3 commented Nov 3, 2018

Rebased

Co-Authored-By: bjorn3 <bjorn3@users.noreply.github.com>
@oli-obk
Copy link
Contributor

oli-obk commented Nov 4, 2018

@bors r+

@bors
Copy link
Contributor

bors commented Nov 4, 2018

📌 Commit 9e479c2 has been approved by oli-obk

@bors 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 Nov 4, 2018
@bors
Copy link
Contributor

bors commented Nov 4, 2018

⌛ Testing commit 9e479c2 with merge ac70882...

bors added a commit that referenced this pull request 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
Copy link
Contributor

bors commented Nov 4, 2018

☀️ Test successful - status-appveyor, status-travis
Approved by: oli-obk
Pushing ac70882 to master...

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants