Update cargo

[ehuss]

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. (Fix overlapping progress with stdout. cargo#6618)
• Improve progress bar flickering. (Improve progress bar flickering. cargo#6615)
• Add detail to multiple rename deps (Add detail to multiple rename deps cargo#6603)
• Fix race condition in local registry crate unpacking (Fix race condition in local registry crate unpacking cargo#6591)
• Revert "Make incremental compilation the default for all profiles." (Revert "Make incremental compilation the default for all profiles." cargo#6610)
• Fixup the docs on crate-type (Fixup the docs on crate-type cargo#6606)
• Document that owner --add now just invites (Document that owner --add now just invites cargo#6604)

[rust-highfive]

r? @nikomatsakis

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

[rust-highfive]

⚠️ Warning ⚠️

• These commits modify submodules.

[ehuss]

cc @michaelwoerister this will disable the incremental experiment.

[alexcrichton]

@bors: r+ p=1

[bors]

📌 Commit 240e7ab728a6d543266f565fed54f4ae6fd8eaa9 has been approved by alexcrichton

[bors]

🔒 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.

[ehuss]

Rebased

[alexcrichton]

@bors: r+ delegate+

[bors]

✌️ @ehuss can now approve this pull request

[bors]

📌 Commit 55917ba has been approved by alexcrichton

[bors]

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

[bors]

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

[michaelwoerister]

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