Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cleanup uses of TypeIdHasher and replace them with StableHasher #50531

Merged
merged 10 commits into from
May 20, 2018

Conversation

iancormac84
Copy link
Contributor

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label May 8, 2018
@rust-highfive
Copy link
Collaborator

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.

[00:04:53] travis_fold:start:tidy
travis_time:start:tidy
tidy check
[00:04:53] tidy error: /checkout/src/librustc_trans_utils/symbol_names.rs:209: line longer than 100 chars
[00:04:54] some tidy checks failed
[00:04:54] 
[00:04:54] 
[00:04:54] 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:04:54] 
[00:04:54] 
[00:04:54] failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test src/tools/tidy
[00:04:54] Build completed unsuccessfully in 0:01:58
[00:04:54] Build completed unsuccessfully in 0:01:58
[00:04:54] make: *** [tidy] Error 1
[00:04:54] Makefile:79: recipe for target 'tidy' failed

The command "stamp sh -x -c "$RUN_SCRIPT"" exited with 2.
travis_time:start:2e052822
$ 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
Copy link
Collaborator

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.

[00:04:52] travis_fold:start:tidy
travis_time:start:tidy
tidy check
[00:04:53] tidy error: /checkout/src/librustc_trans_utils/symbol_names.rs:209: line longer than 100 chars
[00:04:54] some tidy checks failed
[00:04:54] 
[00:04:54] 
[00:04:54] 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:04:54] 
[00:04:54] 
[00:04:54] failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test src/tools/tidy
[00:04:54] Build completed unsuccessfully in 0:01:58
[00:04:54] Build completed unsuccessfully in 0:01:58
[00:04:54] make: *** [tidy] Error 1
[00:04:54] Makefile:79: recipe for target 'tidy' failed

The command "stamp sh -x -c "$RUN_SCRIPT"" exited with 2.
travis_time:start:0ed256e0
$ 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
Copy link
Collaborator

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.
[00:05:36]    Compiling backtrace v0.3.6
[00:05:43]    Compiling rustc_errors v0.0.0 (file:///checkout/src/librustc_errors)
[00:07:14]    Compiling proc_macro v0.0.0 (file:///checkout/src/libproc_macro)
[00:07:30]    Compiling syntax_ext v0.0.0 (file:///checkout/src/libsyntax_ext)
[00:07:35] error: unused import: `middle::const_val::ConstVal`
[00:07:35]   --> librustc/ty/util.rs:18:5
[00:07:35]    |
[00:07:35] 18 | use middle::const_val::ConstVal;
[00:07:35]    |
[00:07:35]    = note: `-D unused-imports` implied by `-D warnings`
[00:07:35] 
[00:07:35] 
[00:07:35] error: unused import: `ty::fold::TypeVisitor`
[00:07:35]   --> librustc/ty/util.rs:21:5
[00:07:35]    |
[00:07:35] 21 | use ty::fold::TypeVisitor;
[00:07:35] 
[00:07:35] 
[00:07:35] error: unused imports: `PrimVal`, `Value`
[00:07:35]   --> librustc/ty/util.rs:28:22
[00:07:35]    |
[00:07:35] 28 | use mir::interpret::{Value, PrimVal};
[00:07:35]    |                      ^^^^^  ^^^^^^^
[00:07:35] error: unused import: `std::hash::Hash`
[00:07:35]   --> librustc/ty/util.rs:34:5
[00:07:35]    |
[00:07:35] 34 | use std::hash::Hash;
---
[00:07:35]    |
[00:07:35] 35 | use std::intrinsics;
[00:07:35]    |     ^^^^^^^^^^^^^^^
[00:07:35] 
8781.so --extern fmt_macros=/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-rustc/x86_64-unknown-linux-gnu/release/deps/libfmt_macros-33787dcdac3a4dd2.so --extern graphviz=/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-rustc/x86_64-unknown-linux-gnu/release/deps/libgraphviz-21ce4bd19908f0cc.so --extern rustc_target=/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-rustc/x86_64-unknown-linux-gnu/release/deps/librustc_target-aed9d8ab86b35123.so --extern syntax_pos=/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-rustc/x86_64-unknown-linux-gnu/release/deps/libsyntax_pos-b9901acb1e9e6766.so --extern rustc_apfloat=/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-rustc/x86_64-unknown-linux-gnu/release/deps/librustc_apfloat-b7c66a9cab3ff5a6.rlib --extern serialize=/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-rustc/x86_64-unknown-linux-gnu/release/deps/libserialize-946eff7380f27f57.so --extern serialize=/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-rustc/x86_64-unknown-linux-gnu/release/deps/libserialize-946eff7380f27f57.rlib --extern arena=/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-rustc/x86_64-unknown-linux-gnu/release/deps/libarena-16776be762f4e8c2.so --extern jobserver=/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-rustc/x86_64-unknown-linux-gnu/release/deps/libjobserver-dd375c0772cf1a0d.rlib --extern log=/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-rustc/x86_64-unknown-linux-gnu/release/deps/liblog-4f0866e958f59455.rlib --extern backtrace=/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-rustc/x86_64-unknown-linux-gnu/release/deps/libbacktrace-19e2a5cf3e91d41b.rlib --extern byteorder=/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-rustc/x86_64-unknown-linux-gnu/release/deps/libbyteorder-c0908caf79d2e3f2.rlib --extern rustc_errors=/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-rustc/x86_64-unknown-linux-gnu/release/deps/librustc_errors-b789a86e1ab64d11.so --extern rustc_data_structures=/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-rustc/x86_64-unknown-linux-gnu/release/deps/librustc_data_structures-f456f53371aa074c.so --extern flate2=/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-rustc/x86_64-unknown-linux-gnu/release/deps/libflate2-206e1aadbc3c6b8a.rlib --extern tempdir=/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-rustc/x86_64-unknown-linux-gnu/release/deps/libtempdir-ee923a086d887011.rlib --extern proc_macro=/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-rustc/x86_64-unknown-linux-gnu/release/deps/libproc_macro-8d928be2ff984c7f.so --extern lazy_static=/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-rustc/x86_64-unknown-linux-gnu/release/deps/liblazy_static-fbe97ade1df6b749.rlib -L native=/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-rustc/x86_64-unknown-linux-gnu/release/build/backtrace-sys-31a3817325787acc/out/.libs -L native=/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-rustc/x86_64-unknown-linux-gnu/release/build/miniz-sys-90c24e5cae9d047e/out` (exit code: 101)
[00:08:01] command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo" "build" "--target" "x86_64-unknown-linux-gnu" "--release" "--locked" "--color" "always" "--features" " jemalloc" "--manifest-path" "/checkout/src/rustc/Cargo.toml" "--message-format" "json"
[00:08:01] expected success, got: exit code: 101
[00:08:01] thread 'main' panicked at 'cargo must succeed', bootstrap/compile.rs:1091:9
[00:08:01] travis_fold:end:stage0-rustc

[00:08:01] travis_time:end:stage0-rustc:start=1525787127228306089,finish=1525787311442790903,duration=184214484814


[00:08:01] failed to run: /checkout/obj/build/bootstrap/debug/bootstrap build
[00:08:01] Build completed unsuccessfully in 0:03:17
[00:08:01] Makefile:28: recipe for target 'all' failed
[00:08:01] make: *** [all] Error 1
314860 ./src/llvm
256636 ./obj/build/x86_64-unknown-linux-gnu/stage0/lib/rustlib/x86_64-unknown-linux-gnu/lib
241192 ./src/llvm-emscripten
210064 ./src/llvm/test
---
149688 ./.git/modules/src
149128 ./src/llvm-emscripten/test
144928 ./obj/build/bootstrap/debug/incremental
123944 ./obj/build/bootstrap/debug/incremental/bootstrap-1wl4zjaz72e5d
123940 ./obj/build/bootstrap/debug/incremental/bootstrap-1wl4zjaz72e5d/s-f0ugujw9bx-1vphh6e-3a8ftmql7i7fg
89700 ./src/llvm/test/CodeGen
83600 ./obj/build/x86_64-unknown-linux-gnu/stage0-rustc
71424 ./.git/modules/src/tools
70944 ./obj/build/x86_64-unknown-linux-gnu/native
---
11788 ./src/doc
10996 ./.git/objects
10696 ./.git/objects/pack
10080 ./src/test/compile-fail
10012 ./src/llvm/test/MC/AMDGPU
9648 ./src/llvm/test/MC/Disassembler/AMDGPU
travis_time:end:3cb567a0:start=1525787311731590867,finish=1525787311897770281,duration=166179414
travis_fold:end:after_failure.1
travis_fold:start:after_failure.2
travis_time:start:22f4da0b

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
Copy link
Collaborator

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.
[00:05:19]    Compiling backtrace v0.3.6
[00:05:27]    Compiling rustc_errors v0.0.0 (file:///checkout/src/librustc_errors)
[00:06:52]    Compiling proc_macro v0.0.0 (file:///checkout/src/libproc_macro)
[00:07:08]    Compiling syntax_ext v0.0.0 (file:///checkout/src/libsyntax_ext)
[00:07:37] error: unused import: `StableHasherResult`
[00:07:37]   --> librustc/ty/util.rs:27:58
[00:07:37]    |
[00:07:37] 27 | use rustc_data_structures::stable_hasher::{StableHasher, StableHasherResult,
[00:07:37]    |
[00:07:37]    = note: `-D unused-imports` implied by `-D warnings`
[00:07:37] 
own-linux-gnu/stage0-sysroot/lib/rustlib/x86_64-unknown-linux-gnu

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
Copy link
Collaborator

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.
[01:37:06] status: exit code: 2
[01:37:06] command: "make"
[01:37:06] stdout:
[01:37:06] ------------------------------------------
[01:37:06] make[1]: Entering directory '/checkout/src/test/run-make-fulldeps/a-b-a-linker-guard'
[01:37:06] LD_LIBRARY_PATH="/checkout/obj/build/x86_64-unknown-linux-gnu/test/run-make-fulldeps/a-b-a-linker-guard.stage2-x86_64-unknown-linux-gnu:/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib:/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-tools/x86_64-unknown-linux-gnu/release/deps:/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-sysroot/lib/rustlib/x86_64-unknown-linux-gnu/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/a-b-a-linker-guard.stage2-x86_64-unknown-linux-gnu -L /checkout/obj/build/x86_64-unknown-linux-gnu/test/run-make-fulldeps/a-b-a-linker-guard.stage2-x86_64-unknown-linux-gnu  a.rs --cfg x -C prefer-dynamic
[01:37:06] LD_LIBRARY_PATH="/checkout/obj/build/x86_64-unknown-linux-gnu/test/run-make-fulldeps/a-b-a-linker-guard.stage2-x86_64-unknown-linux-gnu:/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib:/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-tools/x86_64-unknown-linux-gnu/release/deps:/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-sysroot/lib/rustlib/x86_64-unknown-linux-gnu/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/a-b-a-linker-guard.stage2-x86_64-unknown-linux-gnu -L /checkout/obj/build/x86_64-unknown-linux-gnu/test/run-make-fulldeps/a-b-a-linker-guard.stage2-x86_64-unknown-linux-gnu  b.rs -C prefer-dynamic
[01:37:06] LD_LIBRARY_PATH="/checkout/obj/build/x86_64-unknown-linux-gnu/test/run-make-fulldeps/a-b-a-linker-guard.stage2-x86_64-unknown-linux-gnu:/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/x86_64-unknown-linux-gnu/lib:/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-tools/x86_64-unknown-linux-gnu/release/deps:/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-sysroot/lib/rustlib/x86_64-unknown-linux-gnu/lib:" /checkout/obj/build/x86_64-unknown-linux-gnu/test/run-make-fulldeps/a-b-a-linker-guard.stage2-x86_64-unknown-linux-gnu/b
[01:37:06] LD_LIBRARY_PATH="/checkout/obj/build/x86_64-unknown-linux-gnu/test/run-make-fulldeps/a-b-a-linker-guard.stage2-x86_64-unknown-linux-gnu:/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib:/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-tools/x86_64-unknown-linux-gnu/release/deps:/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-sysroot/lib/rustlib/x86_64-unknown-linux-gnu/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/a-b-a-linker-guard.stage2-x86_64-unknown-linux-gnu -L /checkout/obj/build/x86_64-unknown-linux-gnu/test/run-make-fulldeps/a-b-a-linker-guard.stage2-x86_64-unknown-linux-gnu  a.rs --cfg y -C prefer-dynamic
[01:37:06] LD_LIBRARY_PATH="/checkout/obj/build/x86_64-unknown-linux-gnu/test/run-make-fulldeps/a-b-a-linker-guard.stage2-x86_64-unknown-linux-gnu:/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/x86_64-unknown-linux-gnu/lib:/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-tools/x86_64-unknown-linux-gnu/release/deps:/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-sysroot/lib/rustlib/x86_64-unknown-linux-gnu/lib:" /checkout/obj/build/x86_64-unknown-linux-gnu/test/run-make-fulldeps/a-b-a-linker-guard.stage2-x86_64-unknown-linux-gnu/b && exit 1 || exit 0
[01:37:06] Makefile:8: recipe for target 'all' failed
[01:37:06] make[1]: Leaving directory '/checkout/src/test/run-make-fulldeps/a-b-a-linker-guard'
[01:37:06] ------------------------------------------
[01:37:06] stderr:
[01:37:06] ------------------------------------------
[01:37:06] warning: unused variable: `x`
[01:37:06] warning: unused variable: `x`
[01:37:06]   --> a.rs:15:12
[01:37:06]    |
[01:37:06] 15 | pub fn foo(x: u32) { }
[01:37:06]    |            ^ help: consider using `_x` instead
[01:37:06]    = note: #[warn(unused_variables)] on by default
[01:37:06] 
[01:37:06] warning: unused variable: `x`
[01:37:06]   --> a.rs:18:12
[01:37:06]   --> a.rs:18:12
[01:37:06]    |
[01:37:06] 18 | pub fn foo(x: i32) { }
[01:37:06]    |            ^ help: consider using `_x` instead
[01:37:06]    = note: #[warn(unused_variables)] on by default
[01:37:06] 
[01:37:06] 
[01:37:06] make[1]: *** [all] Error 1
[01:37:06] ------------------------------------------
[01:37:06] 
[01:37:06] 
[01:37:06] thread '[run-make] run-make-fulldeps/a-b-a-linker-guard' panicked at 'explicit panic', tools/compiletest/src/runtest.rs:3033:9
[01:37:06] 
[01:37:06] 
[01:37:06] failures:
[01:37:06]     [run-make] run-make-fulldeps/a-b-a-linker-guard
[01:37:06]     [run-make] run-make-fulldeps/a-b-a-linker-guard
[01:37:06] 
[01:37:06] test result: FAILED. 182 passed; 1 failed; 0 ignored; 0 measured; 0 filtered out
[01:37:06] 
[01:37:06] 
[01:37:06] 
[01:37:06] command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-tools-bin/compiletest" "--compile-lib-path" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib" "--run-lib-path" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/x86_64-unknown-linux-gnu/lib" "--rustc-path" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "--rustdoc-path" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustdoc" "--src-base" "/checkout/src/test/run-make-fulldeps" "--build-base" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/run-make-fulldeps" "--stage-id" "stage2-x86_64-unknown-linux-gnu" "--mode" "run-make" "--target" "x86_64-unknown-linux-gnu" "--host" "x86_64-unknown-linux-gnu" "--llvm-filecheck" "/usr/lib/llvm-3.9/bin/FileCheck" "--host-rustcflags" "-Crpath -O -Zunstable-options " "--target-rustcflags" "-Crpath -O -Zunstable-options  -Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "--docck-python" "/usr/bin/python2.7" "--lldb-python" "/usr/bin/python2.7" "--gdb" "/usr/bin/gdb" "--quiet" "--llvm-version" "3.9.1\n" "--system-llvm" "--cc" "cc" "--cxx" "c++" "--cflags" "-ffunction-sections -fdata-sections -fPIC -m64" "--llvm-components" "aarch64 aarch64asmparser aarch64asmprinter aarch64codegen aarch64desc aarch64disassembler aarch64info aarch64utils all all-targets amdgpu amdgpuasmparser amdgpuasmprinter amdgpucodegen amdgpudesc amdgpudisassembler amdgpuinfo amdgpuutils analysis arm armasmparser armasmprinter armcodegen armdesc armdisassembler arminfo asmparser asmprinter bitreader bitwriter bpf bpfasmprinter bpfcodegen bpfdesc bpfinfo codegen core coverage debuginfocodeview debuginfodwarf debuginfopdb engine executionengine globalisel hexagon hexagonasmparser hexagoncodegen hexagondesc hexagondisassembler hexagoninfo instcombine instrumentation interpreter ipo irreader libdriver lineeditor linker lto mc mcdisassembler mcjit mcparser mips mipsasmparser mipsasmprinter mipscodegen mipsdesc mipsdisassembler mipsinfo mirparser msp430 msp430asmprinter msp430codegen msp430desc msp430info native nativecodegen nvptx nvptxasmprinter nvptxcodegen nvptxdesc nvptxinfo objcarcopts object objectyaml option orcjit passes powerpc powerpcasmparser powerpcasmprinter powerpccodegen powerpcdesc powerpcdisassembler powerpcinfo profiledata runtimedyld scalaropts selectiondag sparc sparcasmparser sparcasmprinter sparccodegen sparcdesc sparcdisassembler sparcinfo support symbolize systemz systemzasmparser systemzasmprinter systemzcodegen systemzdesc systemzdisassembler systemzinfo tablegen target transformutils vectorize x86 x86asmparser x86asmprinter x86codegen x86desc x86disassembler x86info x86utils xcore xcoreasmprinter xcorecodegen xcoredesc xcoredisassembler xcoreinfo" "--llvm-cxxflags" "-I/usr/lib/llvm-3.9/include -std=c++0x -gsplit-dwarf -Wl,-fuse-ld=gold -fPIC -fvisibility-inlines-hidden -Wall -W -Wno-unused-parameter -Wwrite-strings -Wcast-qual -Wno-missing-field-initializers -pedantic -Wno-long-long -Wno-maybe-uninitialized -Wdelete-non-virtual-dtor -Wno-comment -Werror=date-time -std=c++11 -ffunction-sections -fdata-sections -O2 -g -DNDEBUG  -fno-exceptions -D_GNU_SOURCE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS" "--ar" "ar" "--adb-path" "adb" "--adb-test-dir" "/data/tmp/work" "--android-cross-path" "" "--color" "always"
[01:37:06] 
[01:37:06] 
[01:37:06] failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test
[01:37:06] Build completed unsuccessfully in 0:50:11
[01:37:06] Build completed unsuccessfully in 0:50:11
[01:37:06] Makefile:58: recipe for target 'check' failed
[01:37:06] make: *** [check] Error 1

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

@michaelwoerister
Copy link
Member

Thanks, @iancormac84! Looks great. Let's see if this affects performance.

@bors try

@bors
Copy link
Contributor

bors commented May 9, 2018

⌛ Trying commit 2a996a7 with merge 743a872...

bors added a commit that referenced this pull request May 9, 2018
[WIP] Cleanup uses of TypeIdHasher and replace them with StableHasher

Fixes #50424

r? @michaelwoerister
@bors
Copy link
Contributor

bors commented May 9, 2018

☀️ Test successful - status-travis
State: approved= try=True

@kennytm
Copy link
Member

kennytm commented May 9, 2018

@Mark-Simulacrum perf requested. 743a8724ab405b092f6311bbef137c098d405e63 (try) vs 8ff4b42064b374bb62043f7729f84b6d979c7667 (master (measured)).

@kennytm kennytm added the S-waiting-on-perf Status: Waiting on a perf run to be completed. label May 9, 2018
@michaelwoerister
Copy link
Member

@Mark-Simulacrum, could you enqueue a perf run please?

@Mark-Simulacrum
Copy link
Member

Sorry about that, perf is now queued.

@iancormac84
Copy link
Contributor Author

Hi @michaelwoerister. Anything I need to do? I noticed the merge conflict, and tried a git rebase, the resolves of which I didn't like, so I cherry-picked my commits on to another branch. I'm still a newbie at using Git, so I'm not 100% sure what's best.

@michaelwoerister
Copy link
Member

I'm still waiting for the performance results to see if this introduces any regressions. Once those are in and look good, you need to do the following:

# get the latest version of master
git fetch upstream

# rebase your branch onto master
git rebase upstream/master

# resolve any conflicts that arise during rebase and require manual resolving
...

# Push your changes so they show up here on github.
git push -f

You can already do that now. Performance testing won't be affected by it.

@iancormac84
Copy link
Contributor Author

Ah, okay. Thanks!

@kennytm kennytm removed the S-waiting-on-perf Status: Waiting on a perf run to be completed. label May 11, 2018
@kennytm
Copy link
Member

kennytm commented May 11, 2018

Perf result is ready @michaelwoerister. Almost no change in performance in general.

@TimNN TimNN 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-review Status: Awaiting review from the assignee but also interested parties. labels May 15, 2018
@TimNN
Copy link
Contributor

TimNN commented May 15, 2018

@iancormac84: If I understand correctly, this PR should be good to go, could you rebase the PR as requested by @michaelwoerister above?

@iancormac84 iancormac84 changed the title [WIP] Cleanup uses of TypeIdHasher and replace them with StableHasher Cleanup uses of TypeIdHasher and replace them with StableHasher May 15, 2018
@rust-highfive
Copy link
Collaborator

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.
[00:06:31]    Compiling syntax_pos v0.0.0 (file:///checkout/src/libsyntax_pos)
[00:06:36]    Compiling rustc_errors v0.0.0 (file:///checkout/src/librustc_errors)
[00:08:20]    Compiling proc_macro v0.0.0 (file:///checkout/src/libproc_macro)
[00:08:39]    Compiling syntax_ext v0.0.0 (file:///checkout/src/libsyntax_ext)
[00:08:44] error: unused import: `middle::const_val::ConstVal`
[00:08:44]   --> librustc/ty/util.rs:18:5
[00:08:44] 18 | use middle::const_val::ConstVal;
[00:08:44]    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^
[00:08:44]    |
[00:08:44]    = note: `-D unused-imports` implied by `-D warnings`
[00:08:44]    = note: `-D unused-imports` implied by `-D warnings`
[00:08:44] 
_64-unknown-linux-gnu/release/deps/libtempdir-ee923a086d887011.rlib --extern rustc_target=/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-rustc/x86_64-unknown-linux-gnu/release/deps/librustc_target-aed9d8ab86b35123.so --extern serialize=/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-rustc/x86_64-unknown-linux-gnu/release/deps/libserialize-946eff7380f27f57.so --extern serialize=/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-rustc/x86_64-unknown-linux-gnu/release/deps/libserialize-946eff7380f27f57.rlib -L native=/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-rustc/x86_64-unknown-linux-gnu/release/build/backtrace-sys-ffd9dcc5ce13143f/out/.libs -L native=/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-rustc/x86_64-unknown-linux-gnu/release/build/miniz-sys-41d448831c9d08f1/out` (exit code: 101)
[00:09:16] command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo" "build" "--target" "x86_64-unknown-linux-gnu" "--release" "--locked" "--color" "always" "--features" " jemalloc" "--manifest-path" "/checkout/src/rustc/Cargo.toml" "--message-format" "json"
[00:09:16] expected success, got: exit code: 101
[00:09:16] thread 'main' panicked at 'cargo must succeed', bootstrap/compile.rs:1091:9
[00:09:16] travis_fold:end:stage0-rustc

[00:09:16] travis_time:end:stage0-rustc:start=1526429856932487141,finish=1526430080730588367,duration=223798101226

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)

@bors
Copy link
Contributor

bors commented May 16, 2018

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

@rust-highfive
Copy link
Collaborator

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.
[00:06:08]    Compiling syntax_pos v0.0.0 (file:///checkout/src/libsyntax_pos)
[00:06:12]    Compiling rustc_errors v0.0.0 (file:///checkout/src/librustc_errors)
[00:07:45]    Compiling proc_macro v0.0.0 (file:///checkout/src/libproc_macro)
[00:08:02]    Compiling syntax_ext v0.0.0 (file:///checkout/src/libsyntax_ext)
[00:08:08] error: unused import: `ty::fold::TypeVisitor`
[00:08:08]   --> librustc/ty/util.rs:20:5
[00:08:08]    |
[00:08:08] 20 | use ty::fold::TypeVisitor;
[00:08:08]    |
[00:08:08]    = note: `-D unused-imports` implied by `-D warnings`
[00:08:08] 
[00:08:34] error: aborting due to previous error

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)

@michaelwoerister
Copy link
Member

Sorry about the delay. I was out sick for a couple of days. Yes, this should be good to go once it passes travis again.

@iancormac84
Copy link
Contributor Author

@michaelwoerister sorry to hear. Hope you've made a full recovery.

Updates made.

@kennytm kennytm added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels May 17, 2018
@bors
Copy link
Contributor

bors commented May 17, 2018

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

@rust-highfive
Copy link
Collaborator

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.
[00:20:38]    Compiling build_helper v0.1.0 (file:///checkout/src/build_helper)
[00:20:38]    Compiling rustc_codegen_llvm v0.0.0 (file:///checkout/src/librustc_codegen_llvm)
[00:20:38]    Compiling cc v1.0.15
[00:20:39]    Compiling rustc_llvm v0.0.0 (file:///checkout/src/librustc_llvm)
[00:20:48] error[E0433]: failed to resolve. Use of undeclared type or module `StableHasher`
[00:20:48]    --> librustc_codegen_llvm/debuginfo/metadata.rs:145:26
[00:20:48]     |
[00:20:48] 145 |         let mut hasher = StableHasher::<Fingerprint>::new();
[00:20:48]     |                          ^^^^^^^^^^^^ Use of undeclared type or module `StableHasher`
[00:20:48] 
[00:20:50] error[E0599]: no method named `hash_stable` found for type `&rustc::ty::TyS<'_>` in the current scope
[00:20:50]    --> librustc_codegen_llvm/debuginfo/metadata.rs:150:23
[00:20:50]     |
[00:20:50] 150 |                 type_.hash_stable(hcx, &mut hasher);
[00:20:50]     |
[00:20:50]     = help: items from traits can only be used if the trait is in scope
[00:20:50]     = note: the following trait is implemented but not in scope, perhaps add a `use` for it:
[00:20:50]             candidate #1: `use rustc_data_structures::stable_hasher::HashStable;`
[00:20:50]             candidate #1: `use rustc_data_structures::stable_hasher::HashStable;`
[00:20:50] 
[00:20:50] error[E0277]: the trait bound `str: std::marker::Sized` is not satisfied
[00:20:50]    --> librustc_codegen_llvm/debuginfo/metadata.rs:153:13
[00:20:50]     |
[00:20:50] 153 |         let unique_type_id = hasher.finish().to_hex();
[00:20:50]     |             ^^^^^^^^^^^^^^ `str` does not have a constant size known at compile-time
[00:20:50]     |
[00:20:50]     = help: the trait `std::marker::Sized` is not implemented for `str`
[00:20:50]     = note: all local variables must have a statically known size
[00:20:52] error: aborting due to 3 previous errors
[00:20:52] 
[00:20:52] Some errors occurred: E0277, E0433, E0599.
[00:20:52] For more information about an error, try `rustc --explain E0277`.
[00:20:52] For more information about an error, try `rustc --explain E0277`.
[00:20:52] error: Could not compile `rustc_codegen_llvm`.
[00:20:52] 
[00:20:52] Caused by:
[00:20:52]   process didn't exit successfully: `/checkout/obj/build/bootstrap/debug/rustc --crate-name rustc_codegen_llvm librustc_codegen_llvm/lib.rs --color always --error-format json --crate-type dylib --emit=dep-info,link -C prefer-dynamic -C opt-level=3 --cfg feature="jemalloc" --cfg feature="rustc_target" -C metadata=b92357ade41ea302 -C extra-filename=-b92357ade41ea302 --out-dir /checkout/obj/build/x86_64-unknown-linux-gnu/stage0-rustc/x86_64-unknown-linux-gnu/release/deps --target x86_64-unknown-linux-gnu -L dependency=/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-rustc/x86_64-unknown-linux-gnu/release/deps -L dependency=/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-rustc/release/deps --extern rustc_mir=/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-rustc/x86_64-unknown-linux-gnu/release/deps/librustc_mir-8c428dcf5a112e65.so --extern rustc_demangle=/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-rustc/x86_64-unknown-linux-gnu/release/deps/librustc_demangle-06f3d00d16d748ac.rlib --extern rustc_errors=/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-rustc/x86_64-unknown-linux-gnu/release/deps/librustc_errors-029c79b35b3d2152.so --extern bitflags=/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-rustc/x86_64-unknown-linux-gnu/release/deps/libbitflags-f223cc35df6c29ec.rlib --extern num_cpus=/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-rustc/x86_64-unknown-linux-gnu/release/deps/libnum_cpus-63d08112eafc7ec5.rlib --extern rustc_target=/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-rustc/x86_64-unknown-linux-gnu/release/deps/librustc_target-a7e6c70c1d8dd47c.so --extern log=/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-rustc/x86_64-unknown-linux-gnu/release/deps/liblog-bde077c9625bcd15.rlib --extern syntax_pos=/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-rustc/x86_64-unknown-linux-gnu/release/deps/libsyntax_pos-01d5fdf06e96971b.so --extern rustc_incremental=/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-rustc/x86_64-unknown-linux-gnu/release/deps/librustc_incremental-d18b6c0e8f47b341.so --extern rustc=/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-rustc/x86_64-unknown-linux-gnu/release/deps/librustc-ef6ca4ebda266b83.so --extern flate2=/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-rustc/x86_64-unknown-linux-gnu/release/deps/libflate2-7a064031021abb10.rlib --extern tempdir=/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-rustc/x86_64-unknown-linux-gnu/release/deps/libtempdir-5940c2a57172dcdb.rlib --extern cc=/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-rustc/x86_64-unknown-linux-gnu/release/deps/libcc-bc18792c428d5db9.rlib --extern libc=/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-rustc/x86_64-unknown-linux-gnu/release/deps/liblibc-eeb182705d30c885.rlib --extern rustc_apfloat=/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-rustc/x86_64-unknown-linux-gnu/release/deps/librustc_apfloat-3024734921a8d3c2.rlib --extern syntax=/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-rustc/x86_64-unknown-linux-gnu/release/deps/libsyntax-b6248f90fefe05c1.so --extern rustc_llvm=/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-rustc/x86_64-unknown-linux-gnu/release/deps/librustc_llvm-b935674ebc6cf62f.rlib --extern serialize=/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-rustc/x86_64-unknown-linux-gnu/release/deps/libserialize-a476bbed33563995.so --extern serialize=/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-rustc/x86_64-unknown-linux-gnu/release/deps/libserialize-a476bbed33563995.rlib --extern rustc_allocator=/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-rustc/x86_64-unknown-linux-gnu/release/deps/librustc_allocator-188b86557d2f47a0.so --extern jobserver=/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-rustc/x86_64-unknown-linux-gnu/release/deps/libjobserver-ae6ba972807bb99f.rlib --extern rustc_platform_intrinsics=/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-rustc/x86_64-unknown-linux-gnu/release/deps/librustc_platform_intrinsics-a11aa962d27a56e4.so --extern rustc_codegen_utils=/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-rustc/x86_64-unknown-linux-gnu/release/deps/librustc_codegen_utils-58e666292c0e8109.so --extern env_logger=/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-rustc/x86_64-unknown-linux-gnu/release/deps/libenv_logger-7598e70b4e56f241.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-949c6ac74d89c4f0.so -L native=/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-rustc/x86_64-unknown-linux-gnu/release/build/miniz-sys-c0082fee642cc0bf/out -L native=/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-rustc/x86_64-unknown-linux-gnu/release/build/backtrace-sys-f085762345e9053e/out/.libs -L native=/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-rustc/x86_64-unknown-linux-gnu/release/build/rustc_llvm-dcfd0659688e17a9/out -L native=/usr/lib/llvm-3.9/lib` (exit code: 101)
[00:20:52] 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" "--manifest-path" "/checkout/src/librustc_codegen_llvm/Cargo.toml" "--features" " jemalloc" "--message-format" "json"
[00:20:52] expected success, got: exit code: 101
[00:20:52] thread 'main' panicked at 'cargo must succeed', bootstrap/compile.rs:1091:9
[00:20:52] travis_fold:start:stage0-rustc_codegen_llvm
travis_time:start:stage0-rustc_codegen_llvm
travis_fold:end:stage0-rustc_codegen_llvm


[00:20:52] travis_time:end:stage0-rustc_codegen_llvm:start=1526593229846976926,finish=1526593243921389416,duration=14074412490

[00:20:52] failed to run: /checkout/obj/build/bootstrap/debug/bootstrap build
[00:20:52] Build completed unsuccessfully in 0:15:47
[00:20:52] make: *** [all] Error 1
[00:20:52] Makefile:28: recipe for target 'all' failed

The command "stamp sh -x -c "$RUN_SCRIPT"" exited with 2.
travis_time:start:097d1e82
2392656 .
---
150740 ./.git/modules/src
149124 ./src/llvm-emscripten/test
137068 ./obj/build/bootstrap/debug/incremental
122516 ./obj/build/bootstrap/debug/incremental/bootstrap-1r3bppl29tbrj
122512 ./obj/build/bootstrap/debug/incremental/bootstrap-1r3bppl29tbrj/s-f14qqn02pe-122hgq-ki6mp0u53dvu
89804 ./src/llvm/test/CodeGen
76652 ./obj/build/x86_64-unknown-linux-gnu/stage0-rustc
71856 ./.git/modules/src/tools
70944

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)

@michaelwoerister
Copy link
Member

Thanks for keeping things rebased, @iancormac84!

@bors r+ rollup

@bors
Copy link
Contributor

bors commented May 18, 2018

📌 Commit 0349394 has been approved by michaelwoerister

@bors 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 May 18, 2018
kennytm added a commit to kennytm/rust that referenced this pull request May 19, 2018
…nup, r=michaelwoerister

Cleanup uses of TypeIdHasher and replace them with StableHasher

Fixes rust-lang#50424

r? @michaelwoerister
bors added a commit that referenced this pull request May 19, 2018
Rollup of 8 pull requests

Successful merges:

 - #50531 (Cleanup uses of TypeIdHasher and replace them with StableHasher)
 - #50819 (Fix potential divide by zero)
 - #50827 (Update LLVM to 56c931901cfb85cd6f7ed44c7d7520a8de1edf97)
 - #50829 (CheckLoopVisitor: also visit break expressions)
 - #50854 (in which the unused shorthand field pattern debacle/saga continues)
 - #50858 (Reorder description for snippets in rustdoc documentation)
 - #50883 (Fix warning when building stage0 libcore)
 - #50889 (Update clippy)

Failed merges:
@bors bors merged commit 0349394 into rust-lang:master May 20, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants