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

Cleanup to librustc::session and related code #53073

Merged
merged 8 commits into from
Aug 10, 2018

Conversation

Mark-Simulacrum
Copy link
Member

No functional changes, just some cleanup.

This also creates the rustc_fs_util crate, but I can remove that change if desired. It felt a little odd to force crates to depend on librustc for some fs utilities; and also seemed good to generally keep the size of librustc lower (for compile times); fs_util will compile in parallel with essentially the first crate since it has no dependencies beyond std.

@rust-highfive
Copy link
Collaborator

r? @pnkfelix

(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 Aug 4, 2018
@pnkfelix
Copy link
Member

pnkfelix commented Aug 9, 2018

@bors r+

@bors
Copy link
Contributor

bors commented Aug 9, 2018

📌 Commit 49c6e33ee236b6ebbfcda57b4fc103bd235a1351 has been approved by pnkfelix

@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 Aug 9, 2018
@bors
Copy link
Contributor

bors commented Aug 9, 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 data-structures (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 data-structures --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_metadata/schema.rs
Auto-merging src/librustc_metadata/encoder.rs
Auto-merging src/librustc_metadata/decoder.rs
Auto-merging src/librustc_metadata/cstore_impl.rs
Auto-merging src/librustc_incremental/lib.rs
Auto-merging src/librustc_fs_util/lib.rs
Auto-merging src/librustc_data_structures/svh.rs
Auto-merging src/librustc_data_structures/lib.rs
Auto-merging src/librustc_data_structures/fingerprint.rs
Auto-merging src/librustc_codegen_llvm/lib.rs
Auto-merging src/librustc_codegen_llvm/back/write.rs
Auto-merging src/librustc_codegen_llvm/Cargo.toml
CONFLICT (content): Merge conflict in src/librustc_codegen_llvm/Cargo.toml
Auto-merging src/librustc/ty/query/mod.rs
Auto-merging src/librustc/lib.rs
Auto-merging src/librustc/hir/mod.rs
Auto-merging src/librustc/hir/map/mod.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 Aug 9, 2018
@Mark-Simulacrum
Copy link
Member Author

@bors r=pnkfelix

@bors
Copy link
Contributor

bors commented Aug 9, 2018

📌 Commit b3510b08c559cbccb740e61030e8a97b7dd292a2 has been approved by pnkfelix

@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 Aug 9, 2018
@Mark-Simulacrum
Copy link
Member Author

Dropped the last commit to try and avoid conflicts

@bors r=pnkfelix

@bors
Copy link
Contributor

bors commented Aug 9, 2018

📌 Commit 488726c094a645388752b0d09971ecb8743ce9dd has been approved by pnkfelix

@Mark-Simulacrum
Copy link
Member Author

@bors r=pnkfelix

@bors
Copy link
Contributor

bors commented Aug 9, 2018

📌 Commit a8e19be has been approved by pnkfelix

@bors
Copy link
Contributor

bors commented Aug 10, 2018

⌛ Testing commit a8e19be with merge db1acaa...

bors added a commit that referenced this pull request Aug 10, 2018
Cleanup to librustc::session and related code

No functional changes, just some cleanup.

This also creates the `rustc_fs_util` crate, but I can remove that change if desired. It felt a little odd to force crates to depend on librustc for some fs utilities; and also seemed good to generally keep the size of librustc lower (for compile times); fs_util will compile in parallel with essentially the first crate since it has no dependencies beyond std.
@bors
Copy link
Contributor

bors commented Aug 10, 2018

☀️ Test successful - status-appveyor, status-travis
Approved by: pnkfelix
Pushing db1acaa to master...

@bors bors merged commit a8e19be into rust-lang:master Aug 10, 2018
@Mark-Simulacrum Mark-Simulacrum deleted the data-structures branch June 8, 2019 13:49
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.

4 participants