Update Cargo

[steveklabnik]

This pulls in rust-lang/cargo#6054, and
is a beta backport of #54334

[rust-highfive]

r? @nikomatsakis

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

[rust-highfive]

⚠️ Warning ⚠️

• Pull requests are usually filed against the master branch for this repo, but this one is against beta. Please double check that you specified the right target!
• These commits modify submodules.

[Mark-Simulacrum]

@bors r+ p=1 because edition priority

[bors]

📌 Commit 889ab28 has been approved by Mark-Simulacrum

[Mark-Simulacrum]

Actually, I think this might run into the same problem as the other pull request in that it doesn't update cargo.lock? Travis seems to be going though so maybe beta didn't need it.

[ehuss]

This removes about 4 days of updates that were in 1.30. Not sure how important that is. The rust beta branch was pointing at a5d82949485802abb45f888d5b8b7f23927f031d of cargo's master (from Sep 13). The cargo-1.30.0 was branched off from b917e35248fe57d11765c5a835de33e335babb7e from Sep 9th. I don't know why the 1.30.0 branch was so far back. Here's the diff: rust-lang/cargo@b917e35...a5d8294

[bors]

⌛ Testing commit 889ab28 with merge c5a2e4239ca0d4b9bef5dcfdb62249f1a8662ed6...

[bors]

💔 Test failed - status-travis

[rust-highfive]

The job dist-i586-gnu-i586-i686-musl 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.

[01:37:07] Build completed successfully in 1:32:25
[01:37:07] + python2.7 ../x.py dist --target i586-unknown-linux-gnu,i686-unknown-linux-musl,i586-unknown-linux-musl
[01:37:07]     Finished dev [unoptimized] target(s) in 0.26s
[01:37:28] fatal: unable to access 'https://github.com/rust-lang/rust.git/': Could not resolve host: github.com
[01:37:28] thread 'main' panicked at 'command did not execute successfully: "git" "ls-remote" "origin" "beta"
[01:37:28] note: Run with `RUST_BACKTRACE=1` for a backtrace.
[01:37:28] failed to run: /checkout/obj/build/bootstrap/debug/bootstrap dist --target i586-unknown-linux-gnu,i686-unknown-linux-musl,i586-unknown-linux-musl
[01:37:28] Build completed unsuccessfully in 0:00:21
travis_time:end:1ab00596:start=1537334197980408234,finish=1537340047008730856,duration=5849028322622
---
travis_time:end:059f0cca:start=1537340048621225390,finish=1537340048625452341,duration=4226951
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:2b6b835e
$ ln -s . checkout && for CORE in obj/cores/core.*; do EXE=$(echo $CORE | sed 's|obj/cores/core\.[0-9]*\.!checkout!\(.*\)|\1|;y|!|/|'); if [ -f "$EXE" ]; then printf travis_fold":start:crashlog\n\033[31;1m%s\033[0m\n" "$CORE"; gdb -q -c "$CORE" "$EXE" -iex 'set auto-load off' -iex 'dir src/' -iex 'set sysroot .' -ex bt -ex q; echo travis_fold":"end:crashlog; fi; done || true
travis_fold:end:after_failure.4
travis_fold:start:after_failure.5
travis_time:start:0077e707
travis_time:start:0077e707
$ cat ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers || true
cat: ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers: No such file or directory
travis_fold:end:after_failure.5
travis_fold:start:after_failure.6
travis_time:start:0b1beb60
$ dmesg | grep -i kill

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)

[steveklabnik]

I think this might run into the same problem as the other pull request in that it doesn't update cargo.lock?

I ran cargo update cargo -p and it didn't change anything.

This removes about 4 days of updates that were in 1.30. Not sure how important that is.

I'm not sure either; this was the path Alex told me to take. I think it's because it has to be before the version bump PR landed. None of that diff looks mega-important to me, so I think it's fine.

[steveklabnik]

[01:37:28] fatal: unable to access 'https://github.com/rust-lang/rust.git/': Could not resolve host: github.com

Seems spurious.

@bors: retry

[bors]

⌛ Testing commit 889ab28 with merge 7a0062e...

[bors]

☀️ Test successful - status-appveyor, status-travis
Approved by: Mark-Simulacrum
Pushing 7a0062e to beta...

[ehuss]

I think it's because it has to be before the version bump PR landed. None of that diff looks mega-important to me, so I think it's fine.

The version bump was done on the 18th (after the beta branch). This has happened in the past, and @alexcrichton just fixed the branch. Personally I'd be a little disappointed if the new progress bar took another 6 weeks to be stabilized, but it's not critical.

[alexcrichton]

Er sorry, it appears I botched the original base of the rust-1.30.0 branch! I'll fix that.