Update cargo

[ehuss]

• Update transitioning url (Update transitioning url cargo#5889)
• Resolve some clippy lint warnings (Resolve some clippy lint warnings cargo#5884)
• Don't kill child processes on normal exit on Windows ( Don't kill child processes on normal exit on Windows cargo#5887)
• fix a bunch of clippy warnings (fix a bunch of clippy warnings cargo#5876)
• Add support for rustc's --error-format short (Add support for rustc's --error-format short cargo#5879)
• Support JSON with rustdoc. (Support JSON with rustdoc. cargo#5878)
• Fix rustfmt instructions in CONTRIBUTING.md (Fix rustfmt instructions in CONTRIBUTING.md cargo#5880)
• Allow cargo run in workspaces. (Allow cargo run in workspaces. cargo#5877)
• Change target filters in workspaces. (Change target filters in workspaces. cargo#5873)
• Improve verbose console and log for finding git repo in package check (Improve verbose console and log for finding git repo in package check cargo#5858)
• Meta rename (Meta rename cargo#5871)
• fetch: skip target tests when cross_compile is disabled (fetch: skip target tests when cross_compile is disabled cargo#5870)
• Fully capture rustc and rustdoc output when -Zcompile-progress is passed (Fully capture rustc and rustdoc output when -Zcompile-progress is passed cargo#5862)
• Fix test --example docs. (Fix test --example docs. cargo#5867)
• Add a feature to build a vendored OpenSSL (Add a feature to build a vendored OpenSSL cargo#5865)

[rust-highfive]

r? @alexcrichton

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

[rust-highfive]

⚠️ Warning ⚠️

• These commits modify submodules.

[ehuss]

@alexcrichton I'm not sure if you wanted to enable vendored-openssl right away? I'm not certain how that's intended to be used.

[alexcrichton]

@bors: r+

Looks good, thanks!

I'll work on enabling the vendored openssl feature soon

[bors]

📌 Commit 10c7bdb9c40b7a21826da13d26de3a8ce9a3ba90 has been approved by alexcrichton

[kennytm]

@bors p=1

Modifies Cargo.lock, let this be merged first.

[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: src/Cargo.lock (HEAD vs. heads/homu-tmp)
Auto-merging src/Cargo.lock
CONFLICT (content): Merge conflict in src/Cargo.lock
Automatic merge failed; fix conflicts and then commit the result.

[kennytm]

@bors r=alexcrichton

[bors]

📌 Commit 9730871 has been approved by alexcrichton

[bors]

⌛ Testing commit 9730871 with merge 18a4c38...

[bors]

☀️ Test successful - status-appveyor, status-travis
Approved by: alexcrichton
Pushing 18a4c38 to master...