Update cargo revision

[h-michael]

diff: rust-lang/cargo@907c0fe...2458180

[h-michael]

I'll rebase after merging #1276

[alexheretic]

Generally we should update cargo in line with the rust-lang/rust submodule as that is the version of cargo that the release will be built with. This pr is a little later, but tbf I don't think it's a big deal this time so:
@bors r+

[bors]

📌 Commit bb2eb1e has been approved by alexheretic

[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

Auto-merging Cargo.lock
CONFLICT (content): Merge conflict in Cargo.lock
Automatic merge failed; fix conflicts and then commit the result.

[bors]

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

[h-michael]

Generally we should update cargo in line with the rust-lang/rust submodule as that is the version of cargo that the release will be built with.

I'm sorry for missing policy.
I'll fix cargo version later.

[alexheretic]

Well it's just that it isn't obvious (ie wasn't to me) how the release version picks cargo & clippy, so I tend to bang on about it so more people will know.

[h-michael]

@alexheretic I've revased and push :)

[alexheretic]

@bors r+

[bors]

📌 Commit 924862f has been approved by alexheretic

[bors]

⌛ Testing commit 924862f with merge 9335384...

[bors]

💔 Test failed - checks-travis

[alexheretic]

@bors retry

[bors]

⌛ Testing commit 924862f with merge 43dbda5...

[bors]

☀️ Test successful - checks-travis
Approved by: alexheretic
Pushing 43dbda5 to master...