Update cargo

[ehuss]

17 commits in 759b6161a328db1d4863139e90875308ecd25a75..c4fcfb725b4be00c72eb9cf30c7d8b095577c280
2019-05-06 20:47:49 +0000 to 2019-05-15 19:48:47 +0000

• tests: registry: revert readonly permission after running tests. (tests: registry: revert readonly permission after running tests. cargo#6947)
• Remove Candidate (Remove Candidate cargo#6946)
• Fix for "Running cargo update without a Cargo.lock ignores arguments" Running cargo update without a Cargo.lock ignores arguments cargo#6872 (Fix for "Running cargo update without a Cargo.lock ignores arguments" #6872 cargo#6904)
• Fix a minor mistake in the changelog. (Fix a minor mistake in the changelog. cargo#6944)
• Give a better error message when crates.io requests time out (Give a better error message when crates.io requests time out cargo#6936)
• Re-enable compatibility with readonly CARGO_HOME (Re-enable compatibility with readonly CARGO_HOME cargo#6940)
• Fix version of ignore. (Fix version of ignore. cargo#6938)
• Stabilize offline mode. (Stabilize offline mode. cargo#6934)
• zsh: Add doc options to include non-public items documentation (zsh: Add doc options to include non-public items documentation cargo#6929)
• zsh: Suggest --lib option as binary template now the default (zsh: Suggest --lib option as binary template now the default cargo#6926)
• Migrate package include/exclude to gitignore patterns. (Migrate package include/exclude to gitignore patterns. cargo#6924)
• Implement the Cargo half of pipelined compilation (take 2) (Implement the Cargo half of pipelined compilation (take 2) cargo#6883)
• Always include Cargo.toml when packaging. (Always include Cargo.toml when packaging. cargo#6925)
• Remove unnecessary calls to masquerade_as_nightly_cargo. (Remove unnecessary calls to masquerade_as_nightly_cargo. cargo#6923)
• download: fix "Downloaded 1 crates" message (crates -> crate) (download: fix "Downloaded 1 crates" message (crates -> crate) cargo#6920)
• Changed RUST_LOG usage to CARGO_LOG to avoid confusion. (Changed RUST_LOG usage to CARGO_LOG to avoid confusion. cargo#6918)
• crate download: don't print that a crate was the largest download if it was the only download (crate download: don't print that a crate was the largest download if it was the only download cargo#6916)

[rust-highfive]

r? @nikomatsakis

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

[rust-highfive]

⚠️ Warning ⚠️

• These commits modify submodules.

[ehuss]

r? @alexcrichton

This includes an override to allow this PR to pass since it breaks rls. rls cannot be updated due to #60848. The Cargo team would like to land these changes before the beta branch, and it seems unlikely that the clippy/rls issue will be fixed in time.

I have the fixes for rls waiting in the wings (ehuss/rls@f2d51d0), and I'm willing to help fix rls once the clippy issue is resolved.

[Mark-Simulacrum]

cc @Manishearth @Xanewok @nrc re:clippy/rls breakage

[alexcrichton]

@bors: r+

[bors]

📌 Commit 2811d3220b5120fb8432ea623bb01a89d39c1b91 has been approved by alexcrichton

[alexcrichton]

@bors: p=1 delegate+

[bors]

✌️ @ehuss can now approve this pull request

[Eh2406]

One piece of context for those just joining this conversation:
One of the changes included in this (rust-lang/cargo#6940) is a fix for a bug that broke Crater. So this is a High priority, if we want to do the normal Crater runs on Beta.

[Centril]

@bors p=2

[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]

@bors r=alexcrichton

[bors]

📌 Commit 6a09cfa has been approved by alexcrichton

[bors]

⌛ Testing commit 6a09cfa with merge 7d5aa43...

[bors]

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

[rust-highfive]

📣 Toolstate changed by #60874!

Tested on commit 7d5aa43.
Direct link to PR: #60874

💔 rls on windows: test-fail → build-fail (cc @Xanewok, @rust-lang/infra).
💔 rls on linux: test-fail → build-fail (cc @Xanewok, @rust-lang/infra).