Skip to content

Update cargo#58131

Merged
bors merged 1 commit intorust-lang:masterfrom
ehuss:update-cargo
Feb 6, 2019
Merged

Update cargo#58131
bors merged 1 commit intorust-lang:masterfrom
ehuss:update-cargo

Conversation

@ehuss
Copy link
Contributor

@ehuss ehuss commented Feb 3, 2019

7 commits in 245818076052dd7178f5bb7585f5aec5b6c1e03e..4e74e2fc0908524d17735c768067117d3e84ee9c
2019-01-27 15:17:26 +0000 to 2019-02-02 17:48:44 +0000

@rust-highfive
Copy link
Contributor

rust-highfive commented Feb 3, 2019

r? @nikomatsakis

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

@rust-highfive
Copy link
Contributor

rust-highfive commented Feb 3, 2019

⚠️ Warning ⚠️

  • These commits modify submodules.

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Feb 3, 2019
@ehuss
Copy link
Contributor Author

ehuss commented Feb 3, 2019

cc @michaelwoerister this will disable the incremental experiment.

hallcristobal added a commit to hallcristobal/TwilightPrincessDebugMenu that referenced this pull request Feb 4, 2019
@hallcristobal
Disable LTO for now
8a934f6 
Incremental broken on nightly
rust-lang/rust#58131
@phil-opp phil-opp mentioned this pull request Feb 5, 2019
Closed
@ehuss ehuss mentioned this pull request Feb 5, 2019
Merged
@alexcrichton
Copy link
Member

alexcrichton commented Feb 5, 2019

@bors: r+ p=1

@bors
Copy link
Collaborator

bors commented Feb 5, 2019

📌 Commit 240e7ab728a6d543266f565fed54f4ae6fd8eaa9 has been approved by alexcrichton

@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 Feb 5, 2019
@bors
Copy link
Collaborator

bors commented Feb 5, 2019

🔒 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 update-cargo (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 update-cargo --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: Cargo.lock (HEAD vs. heads/homu-tmp)
Auto-merging Cargo.lock
CONFLICT (content): Merge conflict in 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 Feb 5, 2019
@ehuss
Copy link
Contributor Author

ehuss commented Feb 5, 2019

Rebased

@alexcrichton
Copy link
Member

alexcrichton commented Feb 5, 2019

@bors: r+ delegate+

@bors
Copy link
Collaborator

bors commented Feb 5, 2019

✌️ @ehuss can now approve this pull request

@bors
Copy link
Collaborator

bors commented Feb 5, 2019

📌 Commit 55917ba has been approved by alexcrichton

@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 Feb 5, 2019
@bors
Copy link
Collaborator

bors commented Feb 5, 2019

⌛ Testing commit 55917ba with merge 65e647c...

bors added a commit that referenced this pull request Feb 5, 2019
@bors
Auto merge of #58131 - ehuss:update-cargo, r=alexcrichton
65e647c 
Update cargo

7 commits in 245818076052dd7178f5bb7585f5aec5b6c1e03e..4e74e2fc0908524d17735c768067117d3e84ee9c
2019-01-27 15:17:26 +0000 to 2019-02-02 17:48:44 +0000
- Fix overlapping progress with stdout. (rust-lang/cargo#6618)
- Improve progress bar flickering. (rust-lang/cargo#6615)
- Add detail to multiple rename deps (rust-lang/cargo#6603)
- Fix race condition in local registry crate unpacking (rust-lang/cargo#6591)
- Revert "Make incremental compilation the default for all profiles." (rust-lang/cargo#6610)
- Fixup the docs on crate-type (rust-lang/cargo#6606)
- Document that owner --add now just invites (rust-lang/cargo#6604)
@bors
Copy link
Collaborator

bors commented Feb 6, 2019

☀️ Test successful - checks-travis, status-appveyor
Approved by: alexcrichton
Pushing 65e647c to master...

@bors bors merged commit 55917ba into rust-lang:master Feb 6, 2019
@h-michael h-michael mentioned this pull request Feb 6, 2019
Merged
bors added a commit to rust-lang/rls that referenced this pull request Feb 6, 2019
@bors
Auto merge of #1296 - h-michael:update-cargo, r=Xanewok
b52361a 
Bumpup cargo from 2458180 to 4e74e2f

related with rust-lang/rust#58131

diff: rust-lang/cargo@2458180...4e74e2f
@michaelwoerister
Copy link
Member

michaelwoerister commented Feb 6, 2019

Awesome, I think we were able to collect quite a bit of data.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@nikomatsakis nikomatsakis

Labels

S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@ehuss @rust-highfive @alexcrichton @bors @michaelwoerister @nikomatsakis