Final nail in rand 0.4 coffin

[mati865]

Closes#57724

[rust-highfive]

r? @alexcrichton

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

[alexcrichton]

@bors: r+

[bors]

📌 Commit 886adfc7152157da8e5fac595ac17523fe9a08fd has been approved by alexcrichton

[jonas-schievink]

@bors r=alexcrichton

[bors]

📌 Commit 49408776bc987aec69839eb786d9c90ec2e195b9 has been approved by alexcrichton

[bors]

⌛ Testing commit 49408776bc987aec69839eb786d9c90ec2e195b9 with merge e94a01c02fd666454abcdc1442df3e2757ccd44c...

[bors]

💔 Test failed - checks-travis

[rust-highfive]

The job arm-android 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:46:11] test string::test_str_clear ... ok
[01:46:11] test string::test_str_truncate ... ok
[01:46:11] test string::test_str_truncate_invalid_len ... ok
[01:46:11] test string::test_str_truncate_split_codepoint ... ok
[01:46:11] died due to signal 11
[01:46:11] error: test failed, to rerun pass '-p alloc --test collectionstests'
[01:46:11] [01:46:11] command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo" "test" "--target" "arm-linux-androideabi" "-j" "4" "--release" "--locked" "--color" "always" "--features" "panic-unwind backtrace compiler-builtins-c" "--manifest-path" "/checkout/src/libstd/Cargo.toml" "-p" "alloc" "--"
[01:46:11] expected success, got: exit code: 3
[01:46:11] ---
travis_time:end:204a1808:start=1561216248753347049,finish=1561216248762893918,duration=9546869
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:163a9eb6
$ 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 --batch -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:0982c2d0
travis_time:start:0982c2d0
$ 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:2031bf1c
$ 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)

[mati865]

Failed because of #55861, rebased.

[bors]

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

[mati865]

Rebased

[alexcrichton]

@bors: r+

[bors]

📌 Commit 734d31a has been approved by alexcrichton

[mati865]

@bors r=alexcrichton

[bors]

📌 Commit f1280a596517a8560b7bc0599f81bb1a17eb56da has been approved by alexcrichton

[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 deps(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 deps --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.

[mati865]

@bors r=alexcrichton

[bors]

📌 Commit cd8922689437a68fa37562f47e6e03268d4899c0 has been approved by alexcrichton

[bors]

⌛ Testing commit cd8922689437a68fa37562f47e6e03268d4899c0 with merge 0d1a662deb737cc029a5959044944ff3e26a98f5...

[bors]

💔 Test failed - checks-azure

[mati865]

@bors r=alexcrichton

Forgot to run ./x.py after last rebase.

[bors]

📌 Commit 2ac20e2 has been approved by alexcrichton

[bors]

⌛ Testing commit 2ac20e2 with merge a824723...

[bors]

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