Cleanup for librustc::session #52758

Mark-Simulacrum · 2018-07-26T23:01:32Z

Some rather straightforward cleanup. Each commit mostly stands alone.

rust-highfive · 2018-07-26T23:01:43Z

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

rust-highfive · 2018-07-26T23:11:55Z

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

[00:02:21] Successfully tagged rust-ci:latest
[00:02:21] Built container sha256:1d7c006d094f57500ef741cfcdefce332a6c2535299a37e1745e3fe9f3779059
[00:02:21] Uploading finished image to s3://rust-lang-ci-sccache2/docker/254673b822b84233b3d8510170c1c331460198676199202c3bf8d1c7c9e0e1b16875995a19ea0d0d82a3789a612f21c840d7e6245ccdc54916e891d31de24244
[00:02:21] 
[00:02:21] Partial credentials found in env, missing: AWS_SECRET_ACCESS_KEY
[00:02:28] xargs: docker: terminated by signal 13

[00:02:29] travis_time:end:2e7d28a3:start=1532646242223917807,finish=1532646379639474800,duration=137415556993
[CI_JOB_NAME=x86_64-gnu-llvm-5.0]
[00:02:29] [CI_JOB_NAME=x86_64-gnu-llvm-5.0]
---

[00:05:05] travis_fold:start:tidy
travis_time:start:tidy
tidy check
[00:05:05] tidy error: /checkout/src/librustc/session/config.rs:330: line longer than 100 chars
[00:05:06] some tidy checks failed
[00:05:06] 
[00:05:06] 
[00:05:06] command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-tools-bin/tidy" "/checkout/src" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo" "--no-vendor" "--quiet"
[00:05:06] 
[00:05:06] 
[00:05:06] failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test src/tools/tidy
[00:05:06] Build completed unsuccessfully in 0:00:45
[00:05:06] Build completed unsuccessfully in 0:00:45
[00:05:06] Makefile:79: recipe for target 'tidy' failed
[00:05:06] make: *** [tidy] Error 1

The command "stamp sh -x -c "$RUN_SCRIPT"" exited with 2.
travis_time:start:10ebda1c
$ date && (curl -fs --head https://google.com | grep ^Date: | sed 's/Date: //g' || true)
---
travis_time:end:190314fa:start=1532646538108262966,finish=1532646538114369686,duration=6106720
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:1520da96
$ 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:0171a808
travis_time:start:0171a808
$ 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:3194f11e
$ 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)

rust-highfive · 2018-07-26T23:31:13Z

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

[00:02:18] Successfully tagged rust-ci:latest
[00:02:18] Built container sha256:3a2c81f9b8a1633da099160c8d1f37e042d4675ae221b86883d1b84f4b5f9e04
[00:02:18] Uploading finished image to s3://rust-lang-ci-sccache2/docker/254673b822b84233b3d8510170c1c331460198676199202c3bf8d1c7c9e0e1b16875995a19ea0d0d82a3789a612f21c840d7e6245ccdc54916e891d31de24244
[00:02:18] 
[00:02:18] Partial credentials found in env, missing: AWS_SECRET_ACCESS_KEY
[00:02:25] xargs: docker: terminated by signal 13

[00:02:26] travis_time:end:153414c9:start=1532647368838744144,finish=1532647503244758706,duration=134406014562
[CI_JOB_NAME=x86_64-gnu-llvm-5.0]
[00:02:26] [CI_JOB_NAME=x86_64-gnu-llvm-5.0]
---
[00:06:41]    Compiling syntax_pos v0.0.0 (file:///checkout/src/libsyntax_pos)
[00:06:44]    Compiling rustc_errors v0.0.0 (file:///checkout/src/librustc_errors)
[00:07:55]    Compiling proc_macro v0.0.0 (file:///checkout/src/libproc_macro)
[00:08:04]    Compiling syntax_ext v0.0.0 (file:///checkout/src/libsyntax_ext)
[00:08:21] error[E0616]: field `no_leak_check` of struct `session::config::DebuggingOptions` is private
[00:08:21]    --> librustc/infer/higher_ranked/mod.rs:628:12
[00:08:21]     |
[00:08:21] 628 |         if self.tcx.sess.opts.debugging_opts.no_leak_check {
[00:08:21] 
[00:08:21] 
3cb288550.rlib --extern flate2=/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-rustc/x86_64-unknown-linux-gnu/release/deps/libflate2-2b513184d9d612c2.rlib --extern fmt_macros=/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-rustc/x86_64-unknown-linux-gnu/release/deps/libfmt_macros-67c8aaeb97e8d843.so --extern graphviz=/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-rustc/x86_64-unknown-linux-gnu/release/deps/libgraphviz-09a8465c475acbfe.so --extern jobserver=/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-rustc/x86_64-unknown-linux-gnu/release/deps/libjobserver-d405c21c3677962b.rlib --extern lazy_static=/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-rustc/x86_64-unknown-linux-gnu/release/deps/liblazy_static-a185b6f37f2c1490.rlib --extern log=/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-rustc/x86_64-unknown-linux-gnu/release/deps/liblog-96863e4e4a7d8742.rlib --extern parking_lot=/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-rustc/x86_64-unknown-linux-gnu/release/deps/libparking_lot-1436fcd917ac8cb6.rlib --extern polonius_engine=/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-rustc/x86_64-unknown-linux-gnu/release/deps/libpolonius_engine-7f18c5c76091a313.rlib --extern proc_macro=/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-rustc/x86_64-unknown-linux-gnu/release/deps/libproc_macro-e808ab63ca762e81.so --extern rustc_rayon=/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-rustc/x86_64-unknown-linux-gnu/release/deps/librustc_rayon-a4d022068ecc6660.rlib --extern rustc_rayon_core=/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-rustc/x86_64-unknown-linux-gnu/release/deps/librustc_rayon_core-5068b78226e8859d.rlib --extern rustc_apfloat=/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-rustc/x86_64-unknown-linux-gnu/release/deps/librustc_apfloat-f1825829e8a26bad.rlib --extern rustc_data_structures=/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-rustc/x86_64-unknown-linux-gnu/release/deps/librustc_data_structures-6755b57849a2d1c7.so --extern rustc_errors=/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-rustc/x86_64-unknown-linux-gnu/release/deps/librustc_errors-2792a41a3401596f.so --extern rustc_target=/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-rustc/x86_64-unknown-linux-gnu/release/deps/librustc_target-5aa06a687b1a439d.so --extern scoped_tls=/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-rustc/x86_64-unknown-linux-gnu/release/deps/libscoped_tls-2d0488f0587a9fe8.rlib --extern serialize=/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-rustc/x86_64-unknown-linux-gnu/release/deps/libserialize-5615a04cb21f88e7.so --extern serialize=/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-rustc/x86_64-unknown-linux-gnu/release/deps/libserialize-5615a04cb21f88e7.rlib --extern syntax=/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-rustc/x86_64-unknown-linux-gnu/release/deps/libsyntax-62c7dbd871cbb630.so --extern syntax_pos=/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-rustc/x86_64-unknown-linux-gnu/release/deps/libsyntax_pos-04bbe800f5e81b33.so --extern tempfile=/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-rustc/x86_64-unknown-linux-gnu/release/deps/libtempfile-7fdf657794f85f21.rlib -L native=/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-rustc/x86_64-unknown-linux-gnu/release/build/backtrace-sys-7205e6adb9d66e6b/out -L native=/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-rustc/x86_64-unknown-linux-gnu/release/build/miniz-sys-27571ee36438df44/out` (exit code: 101)
[00:08:31] command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo" "build" "--target" "x86_64-unknown-linux-gnu" "-j" "4" "--release" "--locked" "--color" "always" "--features" " jemalloc" "--manifest-path" "/checkout/src/rustc/Cargo.toml" "--message-format" "json"
[00:08:31] expected success, got: exit code: 101
[00:08:31] thread 'main' panicked at 'cargo must succeed', bootstrap/compile.rs:1119:9
[00:08:31] travis_fold:end:stage0-rustc

[00:08:31] travis_time:end:stage0-rustc:start=1532647716485006847,finish=1532647868703844371,duration=152218837524


[00:08:31] failed to run: /checkout/obj/build/bootstrap/debug/bootstrap build
[00:08:31] Build completed unsuccessfully in 0:03:25
[00:08:31] make: *** [all] Error 1
[00:08:31] Makefile:28: recipe for target 'all' failed

The command "stamp sh -x -c "$RUN_SCRIPT"" exited with 2.
travis_time:start:0682a90a
$ 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)

rust-highfive · 2018-07-27T01:00:48Z

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

[00:02:22] Successfully tagged rust-ci:latest
[00:02:22] Built container sha256:c845b7d551e749c0bb22e20fc11fe7b6e4dd7916eea0a0b290d852a6ed8e4bce
[00:02:22] Uploading finished image to s3://rust-lang-ci-sccache2/docker/254673b822b84233b3d8510170c1c331460198676199202c3bf8d1c7c9e0e1b16875995a19ea0d0d82a3789a612f21c840d7e6245ccdc54916e891d31de24244
[00:02:22] 
[00:02:22] Partial credentials found in env, missing: AWS_SECRET_ACCESS_KEY
[00:02:29] xargs: docker: terminated by signal 13

[00:02:30] travis_time:end:031e7680:start=1532649255770690380,finish=1532649394073173811,duration=138302483431
[CI_JOB_NAME=x86_64-gnu-llvm-5.0]
[00:02:30] [CI_JOB_NAME=x86_64-gnu-llvm-5.0]
---
[01:06:12]    Compiling rustc v0.0.0 (file:///checkout/src/librustc)
[01:06:15] error[E0433]: failed to resolve. Use of undeclared type or module `Options`
[01:06:15]     --> librustc/session/config.rs:2618:22
[01:06:15]      |
[01:06:15] 2618 |         let mut v1 = Options::default();
[01:06:15]      |                      ^^^^^^^ Use of undeclared type or module `Options`
[01:06:15] error[E0433]: failed to resolve. Use of undeclared type or module `Options`
[01:06:15]     --> librustc/session/config.rs:2619:22
[01:06:15]      |
[01:06:15]      |
[01:06:15] 2619 |         let mut v2 = Options::default();
[01:06:15]      |                      ^^^^^^^ Use of undeclared type or module `Options`
[01:06:15] error[E0433]: failed to resolve. Use of undeclared type or module `Options`
[01:06:15]     --> librustc/session/config.rs:2620:22
[01:06:15]      |
[01:06:15]      |
[01:06:15] 2620 |         let mut v3 = Options::default();
[01:06:15]      |                      ^^^^^^^ Use of undeclared type or module `Options`
[01:06:15] error[E0433]: failed to resolve. Use of undeclared type or module `Options`
[01:06:15]     --> librustc/session/config.rs:2640:22
[01:06:15]      |
[01:06:15]      |
[01:06:15] 2640 |         let mut v1 = Options::default();
[01:06:15]      |                      ^^^^^^^ Use of undeclared type or module `Options`
[01:06:15] error[E0433]: failed to resolve. Use of undeclared type or module `Options`
[01:06:15]     --> librustc/session/config.rs:2641:22
[01:06:15]      |
[01:06:15]      |
[01:06:15] 2641 |         let mut v2 = Options::default();
[01:06:15]      |                      ^^^^^^^ Use of undeclared type or module `Options`
[01:06:15] error[E0433]: failed to resolve. Use of undeclared type or module `Options`
[01:06:15]     --> librustc/session/config.rs:2661:22
[01:06:15]      |
[01:06:15]      |
[01:06:15] 2661 |         let mut v1 = Options::default();
[01:06:15]      |                      ^^^^^^^ Use of undeclared type or module `Options`
[01:06:15] error[E0433]: failed to resolve. Use of undeclared type or module `Options`
[01:06:15]     --> librustc/session/config.rs:2662:22
[01:06:15]      |
[01:06:15]      |
[01:06:15] 2662 |         let mut v2 = Options::default();
[01:06:15]      |                      ^^^^^^^ Use of undeclared type or module `Options`
[01:06:15] error[E0433]: failed to resolve. Use of undeclared type or module `Options`
[01:06:15]     --> librustc/session/config.rs:2663:22
[01:06:15]      |
[01:06:15]      |
[01:06:15] 2663 |         let mut v3 = Options::default();
[01:06:15]      |                      ^^^^^^^ Use of undeclared type or module `Options`
[01:06:15] error[E0433]: failed to resolve. Use of undeclared type or module `Options`
[01:06:15]     --> librustc/session/config.rs:2710:22
[01:06:15]      |
[01:06:15]      |
[01:06:15] 2710 |         let mut v1 = Options::default();
[01:06:15]      |                      ^^^^^^^ Use of undeclared type or module `Options`
[01:06:15] error[E0433]: failed to resolve. Use of undeclared type or module `Options`
[01:06:15]     --> librustc/session/config.rs:2711:22
[01:06:15]      |
[01:06:15]      |
[01:06:15] 2711 |         let mut v2 = Options::default();
[01:06:15]      |                      ^^^^^^^ Use of undeclared type or module `Options`
[01:06:15] error[E0433]: failed to resolve. Use of undeclared type or module `Options`
[01:06:15]     --> librustc/session/config.rs:2712:22
[01:06:15]      |
[01:06:15]      |
[01:06:15] 2712 |         let mut v3 = Options::default();
[01:06:15]      |                      ^^^^^^^ Use of undeclared type or module `Options`
[01:06:15] error[E0433]: failed to resolve. Use of undeclared type or module `Options`
[01:06:15]     --> librustc/session/config.rs:2747:22
[01:06:15]      |
[01:06:15]      |
[01:06:15] 2747 |         let mut v1 = Options::default();
[01:06:15]      |                      ^^^^^^^ Use of undeclared type or module `Options`
[01:06:15] error[E0433]: failed to resolve. Use of undeclared type or module `Options`
[01:06:15]     --> librustc/session/config.rs:2748:22
[01:06:15]      |
[01:06:15]      |
[01:06:15] 2748 |         let mut v2 = Options::default();
[01:06:15]      |                      ^^^^^^^ Use of undeclared type or module `Options`
[01:06:15] error[E0433]: failed to resolve. Use of undeclared type or module `Options`
[01:06:15]     --> librustc/session/config.rs:2773:22
[01:06:15]      |
[01:06:15]      |
[01:06:15] 2773 |         let mut v1 = Options::default();
[01:06:15]      |                      ^^^^^^^ Use of undeclared type or module `Options`
[01:06:15] error[E0433]: failed to resolve. Use of undeclared type or module `Options`
[01:06:15]     --> librustc/session/config.rs:2774:22
[01:06:15]      |
[01:06:15]      |
[01:06:15] 2774 |         let mut v2 = Options::default();
[01:06:15]      |                      ^^^^^^^ Use of undeclared type or module `Options`
[01:06:15] error[E0433]: failed to resolve. Use of undeclared type or module `Options`
[01:06:15]     --> librustc/session/config.rs:2775:22
[01:06:15]      |
[01:06:15]      |
[01:06:15] 2775 |         let mut v3 = Options::default();
[01:06:15]      |                      ^^^^^^^ Use of undeclared type or module `Options`
[01:06:15] error[E0433]: failed to resolve. Use of undeclared type or module `Options`
[01:06:15]     --> librustc/session/config.rs:2776:22
[01:06:15]      |
[01:06:15]      |
[01:06:15] 2776 |         let mut v4 = Options::default();
[01:06:15]      |                      ^^^^^^^ Use of undeclared type or module `Options`
[01:06:15] error[E0433]: failed to resolve. Use of undeclared type or module `Options`
[01:06:15]     --> librustc/session/config.rs:2836:22
[01:06:15]      |
[01:06:15]      |
[01:06:15] 2836 |         let mut v1 = Options::default();
[01:06:15]      |                      ^^^^^^^ Use of undeclared type or module `Options`
[01:06:15] error[E0433]: failed to resolve. Use of undeclared type or module `Options`
[01:06:15]     --> librustc/session/config.rs:2837:22
[01:06:15]      |
[01:06:15]      |
[01:06:15] 2837 |         let mut v2 = Options::default();
[01:06:15]      |                      ^^^^^^^ Use of undeclared type or module `Options`
[01:06:15] error[E0433]: failed to resolve. Use of undeclared type or module `Options`
[01:06:15]     --> librustc/session/config.rs:2838:22
[01:06:15]      |
[01:06:15]      |
[01:06:15] 2838 |         let mut v3 = Options::default();
[01:06:15]      |                      ^^^^^^^ Use of undeclared type or module `Options`
[01:06:15] error[E0433]: failed to resolve. Use of undeclared type or module `Options`
[01:06:15]     --> librustc/session/config.rs:2839:22
[01:06:15]      |
[01:06:15]      |
[01:06:15] 2839 |         let mut v4 = Options::default();
[01:06:15]      |                      ^^^^^^^ Use of undeclared type or module `Options`
[01:06:15] error[E0433]: failed to resolve. Use of undeclared type or module `Options`
[01:06:15]     --> librustc/session/config.rs:2886:22
[01:06:15]      |
[01:06:15]      |
[01:06:15] 2886 |         let mut v1 = Options::default();
[01:06:15]      |                      ^^^^^^^ Use of undeclared type or module `Options`
[01:06:15] error[E0433]: failed to resolve. Use of undeclared type or module `Options`
[01:06:15]     --> librustc/session/config.rs:2887:22
[01:06:15]      |
[01:06:15]      |
[01:06:15] 2887 |         let mut v2 = Options::default();
[01:06:15]      |                      ^^^^^^^ Use of undeclared type or module `Options`
[01:06:15] error[E0433]: failed to resolve. Use of undeclared type or module `Options`
[01:06:15]     --> librustc/session/config.rs:2888:22
[01:06:15]      |
[01:06:15]      |
[01:06:15] 2888 |         let mut v3 = Options::default();
[01:06:15]      |                      ^^^^^^^ Use of undeclared type or module `Options`
[01:06:15] error[E0433]: failed to resolve. Use of undeclared type or module `Options`
[01:06:15]     --> librustc/session/config.rs:2921:25
[01:06:15]      |
[01:06:15]      |
[01:06:15] 2921 |         let reference = Options::default();
[01:06:15]      |                         ^^^^^^^ Use of undeclared type or module `Options`
[01:06:15] error[E0433]: failed to resolve. Use of undeclared type or module `Options`
[01:06:15]     --> librustc/session/config.rs:2922:24
[01:06:15]      |
[01:06:15]      |
[01:06:15] 2922 |         let mut opts = Options::default();
[01:06:15]      |                        ^^^^^^^ Use of undeclared type or module `Options`
[01:06:15] error[E0433]: failed to resolve. Use of undeclared type or module `Options`
[01:06:15]     --> librustc/session/config.rs:3059:25
[01:06:15]      |
[01:06:15]      |
[01:06:15] 3059 |         let reference = Options::default();
[01:06:15]      |                         ^^^^^^^ Use of undeclared type or module `Options`
[01:06:15] error[E0433]: failed to resolve. Use of undeclared type or module `Options`
[01:06:15]     --> librustc/session/config.rs:3060:24
[01:06:15]      |
[01:06:15]      |
[01:06:15] 3060 |         let mut opts = Options::default();
[01:06:15]      |                        ^^^^^^^ Use of undeclared type or module `Options`
[01:06:15] error[E0433]: failed to resolve. Use of undeclared type or module `Options`
[01:06:15]     --> librustc/session/config.rs:3193:23
[01:06:15]      |
[01:06:15]      |
[01:06:15] 3193 |         let options = Options::default();
[01:06:15]      |                       ^^^^^^^ Use of undeclared type or module `Options`

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)

rust-highfive · 2018-07-29T00:10:59Z

The job x86_64-gnu-llvm-5.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:start:test_run-make-fulldeps
Check compiletest suite=run-make-fulldeps mode=run-make (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
[01:10:02] 
[01:10:02] running 189 tests
[01:10:30] .....................................................F..............................................
[01:11:24] ........................................................................................test [run-make] run-make-fulldeps/long-linker-command-lines has been running for over 60 seconds
[01:12:19] failures:
[01:12:19] 
[01:12:19] ---- [run-make] run-make-fulldeps/hotplug_codegen_backend stdout ----
[01:12:19] 
[01:12:19] 
[01:12:19] error: make failed
[01:12:19] status: exit code: 2
[01:12:19] command: "make"
[01:12:19] stdout:
[01:12:19] ------------------------------------------
[01:12:19] make[1]: Entering directory '/checkout/src/test/run-make-fulldeps/hotplug_codegen_backend'
[01:12:19] /bin/echo || exit 0 # This test requires /bin/echo to exist
[01:12:19] 
[01:12:19] LD_LIBRARY_PATH="/checkout/obj/build/x86_64-unknown-linux-gnu/test/run-make-fulldeps/hotplug_codegen_backend/hotplug_codegen_backend:/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib:/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-bootstrap-tools/x86_64-unknown-linux-gnu/release/deps:/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/lib:" '/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc' --out-dir /checkout/obj/build/x86_64-unknown-linux-gnu/test/run-make-fulldeps/hotplug_codegen_backend/hotplug_codegen_backend -L /checkout/obj/build/x86_64-unknown-linux-gnu/test/run-make-fulldeps/hotplug_codegen_backend/hotplug_codegen_backend  the_backend.rs --crate-name the_backend --crate-type dylib \
[01:12:19]  -o /checkout/obj/build/x86_64-unknown-linux-gnu/test/run-make-fulldeps/hotplug_codegen_backend/hotplug_codegen_backend/the_backend.dylib
[01:12:19] Makefile:4: recipe for target 'all' failed
[01:12:19] make[1]: Leaving directory '/checkout/src/test/run-make-fulldeps/hotplug_codegen_backend'
[01:12:19] ------------------------------------------
[01:12:19] stderr:
[01:12:19] stderr:
[01:12:19] --android-cross-path" "" "--color" "always"
[01:12:19] 
[01:12:19] 
[01:12:19] failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test
[01:12:19] Build completed unsuccessfully in 0:31:31
[01:12:19] Build completed unsuccessfully in 0:31:31
[01:12:19] make: *** [check] Error 1
[01:12:19] Makefile:58: recipe for target 'check' failed

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)

pnkfelix · 2018-07-31T00:36:50Z

src/librustc_codegen_llvm/intrinsic.rs

-                    tws => bug!("Unsupported target word size for isize: {}", tws),
-                }
-            },
+            ast::IntTy::Isize => cx.tcx.sess.target.isize_ty.bit_width().unwrap() as u64,


this isn't a pure refactoring ... might a mischevious target attempt to choose a bitwidth other than {16,32,64} ?

Having said that, I don't particularly mind either way

(and furthermore, this new code is arguably much cleaner and more directly expressing intent.)

The isize_ty is created via an equivalent match anyway, so I don't think it matters much.

pnkfelix · 2018-07-31T00:39:49Z

@bors r+

bors · 2018-07-31T00:39:50Z

📌 Commit 73f86c4be4382b273aa309b8f79ad42764878326 has been approved by pnkfelix

Mark-Simulacrum · 2018-08-01T01:41:47Z

@bors r-

Merge conflicts

@ghost

Rollup of 31 pull requests Successful merges: - #52332 (dead-code lint: say "constructed" for structs) - #52340 (Document From trait implementations for OsStr, OsString, CString, and CStr) - #52628 (Cleanup some rustdoc code) - #52732 (Remove unstable and deprecated APIs) - #52745 (Update clippy to latest master) - #52756 (rustc: Disallow machine applicability in foreign macros) - #52771 (Clarify thread::park semantics) - #52810 ([NLL] Don't make "fake" match variables mutable) - #52821 (pretty print for std::collections::vecdeque) - #52822 (Fix From<LocalWaker>) - #52824 (Fix -Wpessimizing-move warnings in rustllvm/PassWrapper) - #52831 (remove references to AUTHORS.txt file) - #52835 (Fix Alias intra doc ICE) - #52842 (update comment) - #52846 (Add timeout to use of `curl` in bootstrap.py.) - #52851 (Make the tool_lints actually usable) - #52853 (Improve bootstrap help on stages) - #52859 (Use Vec::extend in SmallVec::extend when applicable) - #52861 (Add targets for HermitCore (https://hermitcore.org) to the Rust compiler and port libstd to it.) - #52867 (releases.md: fix 2 typos) - #52870 (Implement Unpin for FutureObj and LocalFutureObj) - #52876 (run-pass/const-endianness: negate before to_le()) - #52878 (Fix wrong issue number in the test name) - #52883 (Include lifetime in mutability suggestion in NLL messages) - #52904 (NLL: sort diagnostics by span) - #52905 (Fix a typo in unsize.rs) - #52907 (NLL: On "cannot move out of type" error, print original before rewrite) - #52908 (Use SetLenOnDrop in Vec::truncate()) - #52914 (Only run the sparc-abi test on sparc) - #52918 (Backport 1.27.2 release notes) - #52929 (Update compatibility note for 1.28.0 to be correct) Failed merges: - #52758 (Cleanup for librustc::session) - #52799 (Use BitVector for global sets of AttrId) r? @ghost

Mark-Simulacrum · 2018-08-01T12:58:12Z

@bors r=pnkfelix

bors · 2018-08-01T12:58:12Z

📌 Commit 73f86c4be4382b273aa309b8f79ad42764878326 has been approved by pnkfelix

This is a clippy-breaking change.

Mark-Simulacrum · 2018-08-04T12:54:56Z

@bors r=pnkfelix

bors · 2018-08-04T12:54:56Z

📌 Commit 0ae2aa2 has been approved by pnkfelix

bors · 2018-08-04T12:54:57Z

🌲 The tree is currently closed for pull requests below priority 12, this pull request will be tested once the tree is reopened

bors · 2018-08-04T18:22:46Z

⌛ Testing commit 0ae2aa2 with merge 94c3c34...

Cleanup for librustc::session Some rather straightforward cleanup. Each commit mostly stands alone.

bors · 2018-08-04T20:25:03Z

☀️ Test successful - status-appveyor, status-travis
Approved by: pnkfelix
Pushing 94c3c34 to master...

rust-highfive · 2018-08-04T20:26:21Z

📣 Toolstate changed by #52758!

Tested on commit 94c3c34.
Direct link to PR: #52758

💔 clippy-driver on windows: test-pass → build-fail (cc @Manishearth @llogiq @mcarton @oli-obk, @rust-lang/infra).
💔 clippy-driver on linux: test-pass → build-fail (cc @Manishearth @llogiq @mcarton @oli-obk, @rust-lang/infra).

@Manishearth

Tested on commit rust-lang/rust@94c3c34. Direct link to PR: <rust-lang/rust#52758> 💔 clippy-driver on windows: test-pass → build-fail (cc @Manishearth @llogiq @mcarton @oli-obk, @rust-lang/infra). 💔 clippy-driver on linux: test-pass → build-fail (cc @Manishearth @llogiq @mcarton @oli-obk, @rust-lang/infra).

rust-highfive assigned pnkfelix Jul 26, 2018

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 26, 2018

Mark-Simulacrum force-pushed the session-cleanup branch from 91e06fd to bb24e1b Compare July 26, 2018 23:20

Mark-Simulacrum force-pushed the session-cleanup branch from bb24e1b to c7d1db0 Compare July 26, 2018 23:52

Mark-Simulacrum force-pushed the session-cleanup branch from c7d1db0 to f5d6171 Compare July 28, 2018 22:57

Mark-Simulacrum force-pushed the session-cleanup branch from f5d6171 to 73f86c4 Compare July 29, 2018 00:17

pnkfelix reviewed Jul 31, 2018

View reviewed changes

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jul 31, 2018

This was referenced Jul 31, 2018

Rollup of 21 pull requests #52902

Closed

Rollup of 31 pull requests #52931

Closed

bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Aug 1, 2018

Mark-Simulacrum force-pushed the session-cleanup branch from 73f86c4 to 4df3722 Compare August 1, 2018 12:58

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Aug 1, 2018

Mark-Simulacrum added 2 commits August 4, 2018 06:53

Privatize some exports from code_stats

e59e02e

Normalize variants of CrateType to standard style

2a93442

This is a clippy-breaking change.

Mark-Simulacrum added 7 commits August 4, 2018 06:53

Normalize variants of Passes to standard style

b3267dc

Normalize EntryFnType variants to standard style

442a474

Normalize DebugInfoLevel to standard style

2bc7197

Simplify some handling of target_pointer_width

3cc4450

Move basic_options to impl of Default

5fcef25

Move share_generics getter onto options directly

a9093a4

Use diagnostic API on Session

0ae2aa2

Mark-Simulacrum force-pushed the session-cleanup branch from 4df3722 to 0ae2aa2 Compare August 4, 2018 12:54

bors added a commit that referenced this pull request Aug 4, 2018

Auto merge of #52758 - Mark-Simulacrum:session-cleanup, r=pnkfelix

94c3c34

Cleanup for librustc::session Some rather straightforward cleanup. Each commit mostly stands alone.

bors merged commit 0ae2aa2 into rust-lang:master Aug 4, 2018

Mark-Simulacrum deleted the session-cleanup branch June 8, 2019 13:49

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Cleanup for librustc::session #52758

Cleanup for librustc::session #52758

Mark-Simulacrum commented Jul 26, 2018

rust-highfive commented Jul 26, 2018

rust-highfive commented Jul 26, 2018

rust-highfive commented Jul 26, 2018

rust-highfive commented Jul 27, 2018

rust-highfive commented Jul 29, 2018

pnkfelix Jul 31, 2018

pnkfelix Jul 31, 2018

Mark-Simulacrum Jul 31, 2018

pnkfelix commented Jul 31, 2018

bors commented Jul 31, 2018

Mark-Simulacrum commented Aug 1, 2018

Mark-Simulacrum commented Aug 1, 2018

bors commented Aug 1, 2018

Mark-Simulacrum commented Aug 4, 2018

bors commented Aug 4, 2018

bors commented Aug 4, 2018

bors commented Aug 4, 2018

bors commented Aug 4, 2018

rust-highfive commented Aug 4, 2018

Cleanup for librustc::session #52758

Cleanup for librustc::session #52758

Conversation

Mark-Simulacrum commented Jul 26, 2018

rust-highfive commented Jul 26, 2018

rust-highfive commented Jul 26, 2018

rust-highfive commented Jul 26, 2018

rust-highfive commented Jul 27, 2018

rust-highfive commented Jul 29, 2018

pnkfelix Jul 31, 2018

Choose a reason for hiding this comment

pnkfelix Jul 31, 2018

Choose a reason for hiding this comment

Mark-Simulacrum Jul 31, 2018

Choose a reason for hiding this comment

pnkfelix commented Jul 31, 2018

bors commented Jul 31, 2018

Mark-Simulacrum commented Aug 1, 2018

Mark-Simulacrum commented Aug 1, 2018

bors commented Aug 1, 2018

Mark-Simulacrum commented Aug 4, 2018

bors commented Aug 4, 2018

bors commented Aug 4, 2018

bors commented Aug 4, 2018

bors commented Aug 4, 2018

rust-highfive commented Aug 4, 2018