Update cargo

[mati865]

There are few nice fixes waiting already.

[rust-highfive]

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @nikomatsakis (or someone else) soon.

If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes.

Please see the contribution instructions for more information.

[rust-highfive]

Warning

• These commits modify submodules.

[rust-highfive]

The job x86_64-gnu-llvm-3.9 of your PR failed on Travis (raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.

###########################################################               82.4%
######################################################################## 100.0%
[00:01:13] extracting /checkout/obj/build/cache/2018-05-10/cargo-beta-x86_64-unknown-linux-gnu.tar.gz
[00:01:13]     Updating registry `https://github.com/rust-lang/crates.io-index`
[00:01:31] error: the lock file needs to be updated but --locked was passed to prevent this
[00:01:31] failed to run: /checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo build --manifest-path /checkout/src/bootstrap/Cargo.toml --locked
[00:01:31] Build completed unsuccessfully in 0:00:33
[00:01:31] make: *** [prepare] Error 1
[00:01:31] Makefile:81: recipe for target 'prepare' failed
[00:01:32]     Updating registry `https://github.com/rust-lang/crates.io-index`
[00:01:32]     Updating registry `https://github.com/rust-lang/crates.io-index`
[00:01:33] error: the lock file needs to be updated but --locked was passed to prevent this
[00:01:33] failed to run: /checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo build --manifest-path /checkout/src/bootstrap/Cargo.toml --locked
[00:01:33] Build completed unsuccessfully in 0:00:00
[00:01:33] make: *** [prepare] Error 1
[00:01:33] Makefile:81: recipe for target 'prepare' failed
[00:01:35]     Updating registry `https://github.com/rust-lang/crates.io-index`
[00:01:35]     Updating registry `https://github.com/rust-lang/crates.io-index`
[00:01:36] error: the lock file needs to be updated but --locked was passed to prevent this
[00:01:36] failed to run: /checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo build --manifest-path /checkout/src/bootstrap/Cargo.toml --locked
[00:01:36] Build completed unsuccessfully in 0:00:00
[00:01:36] Makefile:81: recipe for target 'prepare' failed
[00:01:36] make: *** [prepare] Error 1
[00:01:39]     Updating registry `https://github.com/rust-lang/crates.io-index`
[00:01:39]     Updating registry `https://github.com/rust-lang/crates.io-index`
[00:01:40] error: the lock file needs to be updated but --locked was passed to prevent this
[00:01:40] failed to run: /checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo build --manifest-path /checkout/src/bootstrap/Cargo.toml --locked
[00:01:40] Build completed unsuccessfully in 0:00:01
[00:01:40] Makefile:81: recipe for target 'prepare' failed
[00:01:40] make: *** [prepare] Error 1
[00:01:44]     Updating registry `https://github.com/rust-lang/crates.io-index`
[00:01:44]     Updating registry `https://github.com/rust-lang/crates.io-index`
[00:01:45] error: the lock file needs to be updated but --locked was passed to prevent this
[00:01:45] failed to run: /checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo build --manifest-path /checkout/src/bootstrap/Cargo.toml --locked
[00:01:45] Build completed unsuccessfully in 0:00:00
[00:01:45] Makefile:81: recipe for target 'prepare' failed
[00:01:45] make: *** [prepare] Error 1
[00:01:45] The command has failed after 5 attempts.

The command "stamp sh -x -c "$RUN_SCRIPT"" exited with 1.
travis_time:start:01c2a7a3
$ date && (curl -fs --head https://google.com | grep ^Date: | sed 's/Date: //g' || true)

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

[nikomatsakis]

r? @alexcrichton

[alexcrichton]

r=me, but looks like the lockfile needs an update?

[mati865]

I see, I'll update it soon when I get access to my machine.

[ishitatsuyuki]

It seems that you did an cargo update, which updates all dependencies available. That can cause some weird regressions and is more likely to cause a merge conflict.

Instead, please do cd src && cargo clean, which is the way that allows Cargo to update the lockfile conservatively. (clean is a little bit silly here, but it's a hack as there's no "just conservatively update" subcommand implemented)

[mati865]

Thank you for the reviews.
Addressed comments and Travis is green, waiting for r.

[alexcrichton]

@bors: r+

[bors]

📌 Commit 9cae4ed has been approved by alexcrichton

[bors]

🔒 Merge conflict

[mati865]

Rebased.
Guess (and expect) I cannot do it but let's try:

@bors r=alexcrichton

[bors]

@mati865: 🔑 Insufficient privileges: Not in reviewers

[alexcrichton]

@bors: r+

[bors]

📌 Commit 05f15d4 has been approved by alexcrichton

[kennytm]

@bors p=1

[bors]

⌛ Testing commit 05f15d4 with merge ad2591c...

[bors]

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