Rollup of 14 pull requests by kennytm · Pull Request #52088 · rust-lang/rust

kennytm · 2018-07-05T23:07:25Z

Successful merges:

rust: add initial changes to support powerpc64le musl #51619 (rust: add initial changes to support powerpc64le musl)
Fix variant background color on hover in search results #51793 (Fix variant background color on hover in search results)
Update LLVM to bring in a wasm codegen fix #52005 (Update LLVM to bring in a wasm codegen fix)
Deduplicate error reports for statics #52016 (Deduplicate error reports for statics)
[cross-lang-lto] Allow the linker to choose the LTO-plugin (which is useful when using LLD) #52019 ([cross-lang-lto] Allow the linker to choose the LTO-plugin (which is useful when using LLD))
Any docs preposition change #52030 (Any docs preposition change)
Strenghten synchronization in Arc::is_unique #52031 (Strenghten synchronization in Arc::is_unique)
[Gardening] Update outdated comments: ByVal -> Scalar #52033 ([Gardening] Update outdated comments: ByVal -> Scalar)
Include VS 2017 in error message. #52055 (Include VS 2017 in error message.)
Add a link to the rustc docs #52063 (Add a link to the rustc docs)
Add a punch card to weird expressions test #52073 (Add a punch card to weird expressions test)
Improve dependency deduplication diagnostics #52080 (Improve dependency deduplication diagnostics)
rustc: Update tracking issue for wasm_import_module #52093 (rustc: Update tracking issue for wasm_import_module)
Fix typo in cell.rs #52096 (Fix typo in cell.rs)

Failed merges:

Closesrust-lang#51986

… LLD)

amend powerpc64le_unknown_linux_musl.rs to fix copyright date

This changes the docs referring to where a user should be wary of depending on "Any" trait impls from warning about relying on them "outside" of their code to warning about relying on them "inside" of their code.

Previously, `is_unique` would not synchronize at all with a `drop` that returned early because it was not the last reference, leading to a data race. Fixesrust-lang#51780

Update error prompt message to indicate that VS 2017 is supported (for a while now).

Shorten the line to make tidy happy.

rust: add initial changes to support powerpc64le musl Initial changes to support rustc building on ppc64le with musl. A PR was also submitted to libc component rust-lang/libc#1023 to add changes to libc musl definitions. A PR was submitted on Alpine alpinelinux/aports#4549 with equivalent temporary patches for building on Alpine for now. As a verification test a github project was put together to build ppc64le versions of rustc, rust-stdlib, and cargo on Alpine, https://github.com/mksully22/ppc64le_alpine_rust_1.26.2

@QuietMisdreavus

… r=QuietMisdreavus Fix variant background color on hover in search results Fixesrust-lang#51792. <img width="1440" alt="screen shot 2018-06-26 at 00 37 24" src="https://user-images.githubusercontent.com/3050060/41879313-60ecf3be-78d9-11e8-9986-21af529ab758.png"> r? @QuietMisdreavus

kennytm · 2018-07-05T23:08:14Z

@bors r+ p=13

bors · 2018-07-05T23:08:15Z

📌 Commit 0a3756b5b0b1aff866972e171e9e6d367de2301c has been approved by kennytm

rust-highfive · 2018-07-06T00:28:07Z

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.

 100% |████████████████████████████████| 51kB 6.4MB/s Collecting botocore==1.10.51 (from awscli)
/usr/local/lib/python2.7/dist-packages/pip/_vendor/requests/packages/urllib3/util/ssl_.py:122: InsecurePlatformWarning: A true SSLContext object is not available. This prevents urllib3 from configuring SSL appropriately and may cause certain SSL connections to fail. You can upgrade to a newer version of Python to solve this. For more information, see https://urllib3.readthedocs.io/en/latest/security.html#insecureplatformwarning.
InsecurePlatformWarning
Downloading https://files.pythonhosted.org/packages/e3/ba/f6c9220d87784a85f24a8f2425edccb2f330d15c304ea2373ed8206a03ca/botocore-1.10.51-py2.py3-none-any.whl (4.4MB)
0% | | 10kB 42.1MB/s eta 0:00:01
0% |▏ | 20kB 25.3MB/s eta 0:00:01
0% |▎ | 30kB 31.5MB/s eta 0:00:01
0% |▎ | 40kB 14.2MB/s eta 0:00:01
---
[00:00:00] +src/ci/init_repo.sh . /home/travis/rustsrc
[00:00:00] travis_fold:start:init_repo
travis_time:start:090f8175
rm 'src/llvm'
[00:00:00] Attempting with retry: sh -c rm -f download-src-llvm.tar.gz && curl -sSL -o download-src-llvm.tar.gz https://github.com/rust-lang/llvm/archive/509f29ac17874394acf4d49d6bae3cd93c652aa1.tar.gz
[00:00:00] Attempting with retry: sh -c rm -f download-src-doc-book.tar.gz && curl -sSL -o download-src-doc-book.tar.gz https://github.com/rust-lang/book/archive/f475da63a18d50217459a601cbef69a4bcac5e71.tar.gz
[00:00:00] rm 'src/doc/rust-by-example'
[00:00:00] Attempting with retry: sh -c rm -f download-src-doc-rust-by-example.tar.gz && curl -sSL -o download-src-doc-rust-by-example.tar.gz https://github.com/rust-lang/rust-by-example/archive/d2a64395a5210a61d3512a3a5c615f5c47699443.tar.gz
[00:00:00] rm 'src/llvm-emscripten'
---
Check compiletest suite=run-make-fulldeps mode=run-make (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
[01:15:44] [01:15:44] running 187 tests
[01:16:24] ....................i...............................................................................
[01:17:16] .........................................................................F............test [run-make] run-make-fulldeps/long-linker-command-lines has been running for over 60 seconds
[01:18:18] failures:
[01:18:18] [01:18:18] thread 'main' panicked at 'Some tests failed', tools/compiletest/src/main.rs:498:22
[01:18:18] ---- [run-make] run-make-fulldeps/target-without-atomics stdout ----
[01:18:18] ---- [run-make] run-make-fulldeps/target-without-atomics stdout ----
[01:18:18] [01:18:18] error: make failed
[01:18:18] status: exit code: 2
[01:18:18] command: "make"
[01:18:18] stdout:
[01:18:18] ------------------------------------------
[01:18:18] make[1]: Entering directory '/checkout/src/test/run-make-fulldeps/target-without-atomics'
[01:18:18] LD_LIBRARY_PATH="/checkout/obj/build/x86_64-unknown-linux-gnu/test/run-make-fulldeps/target-without-atomics/target-without-atomics:/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/target-without-atomics/target-without-atomics -L /checkout/obj/build/x86_64-unknown-linux-gnu/test/run-make-fulldeps/target-without-atomics/target-without-atomics --print cfg --target thumbv6m-none-eabi | "/checkout/src/etc/cat-and-grep.sh" -v target_has_atomic
[01:18:18] [[[ begin stdout ]]]
[01:18:18] debug_assertions
[01:18:18] target_arch="arm"
[01:18:18] target_endian="little"
[01:18:18] target_env=""
[01:18:18] target_has_atomic="16"
[01:18:18] target_has_atomic="32"
[01:18:18] target_has_atomic="8"
[01:18:18] target_has_atomic="ptr"
[01:18:18] target_os="none"
[01:18:18] target_pointer_width="32"
[01:18:18] target_vendor=""
[01:18:18] [01:18:18] [[[ end stdout ]]]
[01:18:18] Error: should not match: target_has_atomic
[01:18:18] Makefile:5: recipe for target 'all' failed
[01:18:18] make[1]: Leaving directory '/checkout/src/test/run-make-fulldeps/target-without-atomics'
[01:18:18] ------------------------------------------
[01:18:18] stderr:
[01:18:18] ------------------------------------------
[01:18:18] ------------------------------------------
[01:18:18] make[1]: *** [all] Error 1
[01:18:18] ------------------------------------------
[01:18:18] [01:18:18] [01:18:18] thread '[run-make] run-make-fulldeps/target-without-atomics' panicked at 'explicit panic', tools/compiletest/src/runtest.rs:3140:9
[01:18:18] [01:18:18] [01:18:18] failures:
[01:18:18] [run-make] run-make-fulldeps/target-without-atomics
[01:18:18] [run-make] run-make-fulldeps/target-without-atomics
[01:18:18] [01:18:18] test result: FAILED. 185 passed; 1 failed; 1 ignored; 0 measured; 0 filtered out
[01:18:18] [01:18:18] [01:18:18] [01:18:18] 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:18:18] [01:18:18] [01:18:18] failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test
[01:18:18] Build completed unsuccessfully in 0:40:57
[01:18:18] Build completed unsuccessfully in 0:40:57
[01:18:18] make: *** [check] Error 1
[01:18:18] Makefile:58: recipe for target 'check' failed
The command "stamp sh -x -c "$RUN_SCRIPT"" exited with 2.
travis_time:start:29930b5a
$ date && (curl -fs --head https://google.com | grep ^Date: | sed 's/Date: //g' || true)
---
travis_time:end:07307ccd:start=1530836882620641119,finish=1530836882628529675,duration=7888556
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:1f2c6e32
$ head -30 ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers || true
head: cannot open ‘./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers’ for reading: No such file or directory
travis_fold:end:after_failure.4
travis_fold:start:after_failure.5
travis_time:start:19e86cf4
$ 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)

bors · 2018-07-06T00:30:15Z

⌛ Testing commit 0a3756b5b0b1aff866972e171e9e6d367de2301c with merge 67b3b2d62abb8f7360050be64d9ba81ebcc6c2fb...

kennytm · 2018-07-06T00:36:30Z

@bors r- retry Failed CI

…r=kennytm Update LLVM to bring in a wasm codegen fix Closesrust-lang#51986

…bank Deduplicate error reports for statics fixesrust-lang#51970

@alexcrichton

…gin, r=alexcrichton [cross-lang-lto] Allow the linker to choose the LTO-plugin (which is useful when using LLD) This PR allows for not specifying an LTO-linker plugin but still let `rustc` invoke the linker with the correct plugin arguments. This is useful when using LLD which does not need the `-plugin` argument. Since LLD is the best linker for this scenario anyway, this change should improve ergonomics quite a bit. r? @alexcrichton

Any docs preposition change This changes the docs referring to where a user should be wary of depending on "Any" trait impls from warning about relying on them "outside" of their code to warning about relying on them "inside" of their code.

kennytm · 2018-07-06T03:45:56Z

@bors retry

A build script segfault, assuming spurious for now.

error: failed to run custom build command for `unicase v1.4.0`
process didn't exit successfully: `C:\projects\rust\build\ct\iron\target\debug\build\unicase-38624802fb981d7a\build-script-build` (exit code: 101)
--- stderr
thread 'main' panicked at 'unexpected -vV format', C:\Users\appveyor\.cargo\registry\src\github.com-1ecc6299db9ec823\rustc_version-0.1.7\src\lib.rs:126:5
note: Run with `RUST_BACKTRACE=1` for a backtrace.

bors · 2018-07-06T03:54:27Z

⌛ Testing commit 5da9fdc with merge 01c430a5043cc55a2f2ac4e9c8d6f8384cefd0a1...

alexcrichton · 2018-07-06T04:22:32Z

@bors: r-

Ah nah I think that's a bug in rustc_version caused by #52052

It's now rust-lang#52090

Add a punch card to weird expressions test

@kennytm

…nnytm Improve dependency deduplication diagnostics r? @kennytm this is obviously hard to test 😆 cc rust-lang#52072

Include VS 2017 in error message. Update error prompt message to indicate that VS 2017 is supported (for a while now).

Add a link to the rustc docs

bors · 2018-07-06T04:58:50Z

💔 Test failed - status-appveyor

rustc: Update tracking issue for wasm_import_module It's now rust-lang#52090

Fix typo in cell.rs

kennytm · 2018-07-06T05:08:00Z

Heh, okay.

@bors r+

Removed #52052 (see comment above)
Removed #51953 (already testing)
Added back #52093 (should fixed test)
Added #52096

bors · 2018-07-06T05:08:00Z

📌 Commit e6ddbab has been approved by kennytm

bors · 2018-07-06T06:48:19Z

⌛ Testing commit e6ddbab with merge 4d9fa23...

Rollup of 14 pull requests Successful merges: - #51619 (rust: add initial changes to support powerpc64le musl) - #51793 (Fix variant background color on hover in search results) - #52005 (Update LLVM to bring in a wasm codegen fix) - #52016 (Deduplicate error reports for statics) - #52019 ([cross-lang-lto] Allow the linker to choose the LTO-plugin (which is useful when using LLD)) - #52030 (Any docs preposition change) - #52031 (Strenghten synchronization in `Arc::is_unique`) - #52033 ([Gardening] Update outdated comments: ByVal -> Scalar) - #52055 (Include VS 2017 in error message.) - #52063 (Add a link to the rustc docs) - #52073 (Add a punch card to weird expressions test) - #52080 (Improve dependency deduplication diagnostics) - #52093 (rustc: Update tracking issue for wasm_import_module) - #52096 (Fix typo in cell.rs) Failed merges:

bors · 2018-07-06T08:59:18Z

☀️ Test successful - status-appveyor, status-travis
Approved by: kennytm
Pushing 4d9fa23 to master...

GuillaumeGomezand others added 17 commits June 26, 2018 00:38

Fix variant background color on hover in search results
4c6385d

Update LLVM to bring in a wasm codegen fix
c4f6f90
Closesrust-lang#51986

Deduplicate error reports for statics
1eeb5dc

Allow the linker to choose the LTO-plugin (which is useful when using…
65ff414
… LLD)

rust: add initial changes to support powerpc64le musl
dd069ea
amend powerpc64le_unknown_linux_musl.rs to fix copyright date

Any docs preposition change
6f223cf
This changes the docs referring to where a user should be wary of depending on "Any" trait impls from warning about relying on them "outside" of their code to warning about relying on them "inside" of their code.

Strenghten synchronization in Arc::is_unique
f96c246
Previously, `is_unique` would not synchronize at all with a `drop` that returned early because it was not the last reference, leading to a data race. Fixesrust-lang#51780

Update outdated comment: ByVal -> Scalar.
ecaa7bc

Include VS 2017 in error message.
1dae60e
Update error prompt message to indicate that VS 2017 is supported (for a while now).

Shorten the line
30063ae
Shorten the line to make tidy happy.

Add a link to the rustc docs
6556c84

Add a punch card to weird expressions test
0ce0177

Vertical list of tools to check
82a1328

Only display difference of features, not all features
f1e3a5a

Address review comments
f352e98

bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Jul 5, 2018

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 Jul 6, 2018

kennytm added 4 commits July 6, 2018 08:49

Rollup merge ofrust-lang#52005- alexcrichton:update-llvm-for-wasm, …
1568b5e
…r=kennytm Update LLVM to bring in a wasm codegen fix Closesrust-lang#51986

Rollup merge ofrust-lang#52016- oli-obk:dedup_static_errors, r=este…
a4846ae
…bank Deduplicate error reports for statics fixesrust-lang#51970

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 6, 2018

Fix typo in cell.rs
fa7f7ac

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 Jul 6, 2018

alexcrichtonand others added 5 commits July 5, 2018 21:27

rustc: Update tracking issue for wasm_import_module
23fbfb5
It's now rust-lang#52090

Rollup merge ofrust-lang#52073- xfix:patch-7, r=oli-obk
596d1a7
Add a punch card to weird expressions test

Rollup merge ofrust-lang#52080- oli-obk:dep_dedup_diagnostics, r=ke…
f1a36fc
…nnytm Improve dependency deduplication diagnostics r? @kennytm this is obviously hard to test 😆 cc rust-lang#52072

Rollup merge ofrust-lang#52055- crlf0710:patch-3, r=Mark-Simulacrum
3c21349
Include VS 2017 in error message. Update error prompt message to indicate that VS 2017 is supported (for a while now).

Rollup merge ofrust-lang#52063- mark-i-m:docs_link, r=kennytm
20e32ee
Add a link to the rustc docs

bors 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 Jul 6, 2018

kennytm added 2 commits July 6, 2018 13:02

Rollup merge ofrust-lang#52093- alexcrichton:update-issue, r=kennytm
1a8011f
rustc: Update tracking issue for wasm_import_module It's now rust-lang#52090

Rollup merge ofrust-lang#52096- d-e-s-o:fix-typo, r=sfackler
e6ddbab
Fix typo in cell.rs

kennytm force-pushed the rollup branch from 5da9fdc to e6ddbabCompare July 6, 2018 05:07

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 6, 2018

kennytm mentioned this pull request Jul 6, 2018
Make verbose --version show if parallel queries are supported. #52052
Closed

bors merged commit e6ddbab into rust-lang:masterJul 6, 2018

Centril added the rollup A PR which is a rollup label Oct 2, 2019

Uh oh!

Uh oh!

Conversation

kennytm commented Jul 5, 2018• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

kennytm commented Jul 5, 2018

Uh oh!

bors commented Jul 5, 2018

Uh oh!

rust-highfive commented Jul 6, 2018

Uh oh!

bors commented Jul 6, 2018

Uh oh!

kennytm commented Jul 6, 2018

Uh oh!

kennytm commented Jul 6, 2018

Uh oh!

bors commented Jul 6, 2018

Uh oh!

alexcrichton commented Jul 6, 2018

Uh oh!

bors commented Jul 6, 2018

Uh oh!

kennytm commented Jul 6, 2018

Uh oh!

bors commented Jul 6, 2018

Uh oh!

bors commented Jul 6, 2018

Uh oh!

bors commented Jul 6, 2018

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

16 participants

kennytm commented Jul 5, 2018•
edited
Loading