Bootstrap cleanup

[Mark-Simulacrum]

Each commit is (mostly) standalone and probably best reviewed as such. Nothing too major just some drive-by nits as I was looking through the code.

r? @alexcrichton

[rust-highfive]

The job x86_64-gnu-llvm-6.0 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.

travis_time:end:21bd8900:start=1559945066405219453,finish=1559945164599846864,duration=98194627411
$ git checkout -qf FETCH_HEAD
travis_fold:end:git.checkout

Encrypted environment variables have been removed for security reasons.
See https://docs.travis-ci.com/user/pull-requests/#pull-requests-and-security-restrictions
$ export SCCACHE_BUCKET=rust-lang-ci-sccache2
$ export SCCACHE_REGION=us-west-1
$ export GCP_CACHE_BUCKET=rust-lang-ci-cache
$ export AWS_ACCESS_KEY_ID=AKIA46X5W6CZEJZ6XT55
---
travis_time:start:test_codegen
Check compiletest suite=codegen mode=codegen (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
[01:09:45] 
[01:09:45] running 144 tests
[01:09:48] i..iii.....iii..iiii.....i......................i..i.................i.....i..........ii.i..i..i.ii. 100/144
[01:09:50] test result: ok. 114 passed; 0 failed; 30 ignored; 0 measured; 0 filtered out
[01:09:50] 
[01:09:50]  finished in 4.747
[01:09:50] travis_fold:end:test_codegen
---
travis_time:start:test_assembly
Check compiletest suite=assembly mode=assembly (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
[01:09:52] 
[01:09:52] running 9 tests
[01:09:52] iiiiiiiii
[01:09:52] 
[01:09:52]  finished in 0.157
[01:09:52] travis_fold:end:test_assembly

---
travis_time:start:test_debuginfo
Check compiletest suite=debuginfo mode=debuginfo-gdb+lldb (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
[01:10:08] 
[01:10:08] running 122 tests
[01:10:34] .iiiii...i.....i..i...i..i.i.i..i.ii..i.i.....i..i....i..........iiii..........i...ii...i.......ii.i 100/122
[01:10:39] .i.i......iii.i.....ii
[01:10:39] 
[01:10:39]  finished in 31.122
[01:10:39] travis_fold:end:test_debuginfo

---
[01:50:36] git could not determine the LLVM submodule commit hash. Assuming that an LLVM build is necessary.
[01:50:36] git could not determine the LLVM submodule commit hash. Assuming that an LLVM build is necessary.
[01:50:36] thread 'main' panicked at 'assertion failed: `(left == right)`
[01:50:36] 
[01:50:36] Diff < left / right > :
[01:50:36]      Std {
[01:50:36]          target: "A",
[01:50:36]          compiler: Compiler {
[01:50:36]              stage: 0,
---
[01:50:36]              stage: 1,
[01:50:36]              host: "A",
[01:50:36]          },
[01:50:36]      },
[01:50:36] >    Std {
[01:50:36] >        target: "B",
[01:50:36] >        compiler: Compiler {
[01:50:36] >            stage: 2,
[01:50:36] >            host: "A",
[01:50:36] >        },
[01:50:36] >    },
[01:50:36]  ]
[01:50:36] ', src/bootstrap/builder.rs:1677:9
[01:50:36] note: Run with `RUST_BACKTRACE=1` environment variable to display a backtrace.
[01:50:36] 
[01:50:36] 

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)

[alexcrichton]

@bors: r+

[bors]

📌 Commit e4c44c7 has been approved by alexcrichton

[bors]

⌛ Testing commit e4c44c7 with merge 5f4ca5209127906f2dd6cfeab72e68bc82164894...

[bors]

💔 Test failed - checks-travis

[rust-highfive]

The job armhf-gnu 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.

travis_time:end:1acfa4fc:start=1560414448012941336,finish=1560414448018766219,duration=5824883
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:0114500d
$ 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:209ce468
travis_time:start:209ce468
$ 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:08915b50
$ 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]

armhf-gnu:

[01:09:09]    Compiling remote-test-server v0.1.0 (/checkout/src/tools/remote-test-server)
[01:09:09] error[E0463]: can't find crate for `std`

[Mark-Simulacrum]

@bors r=alexcrichton

I forgot that the remote test server is intended for consumption on the "remote" so we can't usually build it with the bootstrap compiler (we don't have a std around).

[bors]

📌 Commit d728d27 has been approved by alexcrichton

[bors]

⌛ Testing commit d728d27 with merge d4af6daa95ea475c3c1df5ed074099610f14052a...

[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:45:43] test string::test_str_truncate ... ok
[01:45:43] test string::test_str_truncate_invalid_len ... ok
[01:45:43] test string::test_str_truncate_split_codepoint ... ok
[01:45:43] test string::test_split_off_mid_char ... ok
[01:45:43] died due to signal 11
[01:45:43] error: test failed, to rerun pass '-p alloc --test collectionstests'
[01:45:43] 
[01:45:43] 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:45:43] expected success, got: exit code: 3
[01:45:43] 
---
travis_time:end:184aeac4:start=1560457454522689465,finish=1560457454532226649,duration=9537184
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:0e1f6da6
$ 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:009e3784
travis_time:start:009e3784
$ 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:1e6b56b6
$ 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)

[Mark-Simulacrum]

@bors retry spurious android segfault in collections tests

[bors]

⌛ Testing commit d728d27 with merge cdd7437...

[bors]

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