Update cargo

[ehuss]

Update cargo

19 commits in 545f354259be4e9745ea00a524c0e4c51df01aa6..807429e1b6da4e2ec52488ef2f59e77068c31e1f
2019-05-23 17:45:30 +0000 to 2019-06-11 14:06:10 +0000

• Stabilize publish-lockfile. (Stabilize publish-lockfile. cargo#7026)
• change package cache lock message (change package cache lock message cargo#7029)
• Fix documenting an example. (Fix documenting an example. cargo#7023)
• Fix nonconcurrent tests (Fix nonconcurrent tests cargo#6900)
• Update git2 crates for libgit2 0.28 (Update git2 crates for libgit2 0.28 cargo#7018)
• fix bunch of clippy warnings (fix bunch of clippy warnings cargo#7019)
• Ignore remap-path-prefix in metadata hash. (Ignore remap-path-prefix in metadata hash. cargo#6966)
• Don't synthesize feature diretives for non-optional deps (Don't synthesize feature directives for non-optional deps cargo#7010)
• Handle pipelined tests of libraries (Handle pipelined tests of libraries cargo#7008)
• Import the cargo-vendor subcommand into Cargo (Import the cargo-vendor subcommand into Cargo cargo#6869)
• Remove unnecessary outlives bounds (Remove unnecessary outlives bounds cargo#7000)
• Catch filename output collisions in rustdoc. (Catch filename output collisions in rustdoc.  cargo#6998)
• the testing SAT solver was messed up by a refactor (the testing SAT solver was messed up by a refactor cargo#6995)
• Add some hints to the docs for cfg() targets (Add some hints to the docs for cfg() targets cargo#6990)
• Test the Resolver against the varisat Library (Test the Resolver against the varisat Library cargo#6980)
• Update changelog. (Update changelog. cargo#6984)
• Update cache-messages tracking issue. (Update cache-messages tracking issue. cargo#6987)
• zsh: Add --all-targets option to cargo-check and cargo-build (zsh: Add --all-targets option to cargo-check and cargo-build cargo#6985)
• Fix typo (Fix typo cargo#6982)

[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

[alexcrichton]

@bors: r+

[bors]

📌 Commit 11024fa has been approved by alexcrichton

[bors]

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

[ehuss]

@bors r=alexcrichton

[bors]

📌 Commit de90dd7c0929c9bca1044f8f79f95b53105ad33a has been approved by alexcrichton

[alexcrichton]

@bors: p=1

[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 d2e03b8 has been approved by alexcrichton

[ehuss]

Thanks Alex, you are a wizard. I tested locally on i686-pc-windows-gnu and it worked.

@bors r=alexcrichton

[bors]

📌 Commit afa4827 has been approved by alexcrichton

[bors]

⌛ Testing commit afa4827 with merge 7978ef91322c23a2375a513c1524afef418312de...

[bors]

💔 Test failed - status-appveyor

[alexcrichton]

@bors: retry

Looks like an appveyor issue

[bors]

⌛ Testing commit afa4827 with merge 704ab2b...

[bors]

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

[rust-highfive]

📣 Toolstate changed by #61771!

Tested on commit 704ab2b.
Direct link to PR: #61771

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

[RalfJung]

So does that mean the mention of cargo install cargo-vendor in the README, and src/bootstrap/dist.rs, can be removed?

[ehuss]

So does that mean the mention of cargo install cargo-vendor in the README, and src/bootstrap/dist.rs, can be removed?

Not until this version of cargo becomes the bootstrap version (when 1.37 becomes beta and stage0.txt is updated).