Skip to content

Rollup of 6 pull requests - #67814

Closed
Dylan-DPC-zz wants to merge 13 commits into
rust-lang:masterfrom
Dylan-DPC-zz:rollup-br5irxf
Closed

Rollup of 6 pull requests#67814
Dylan-DPC-zz wants to merge 13 commits into
rust-lang:masterfrom
Dylan-DPC-zz:rollup-br5irxf

Conversation

@Dylan-DPC-zz

Copy link
Copy Markdown

Successful merges:

Failed merges:

r? @ghost

Sebastien Marieand others added 13 commits December 27, 2019 05:32
This has bothered me for a while. It's such a small nit, but...
…imulacrum
allow rustfmt key in [build] section
Permit using `rustfmt` in `config.toml`. It will allow to not download `rustfmt` binary, which is not possible for at least some tiers-3 platforms.
Fixes: rust-lang#67624
r? @Mark-Simulacrum
Less-than is asymmetric, not antisymmetric
This has bothered me for a while. It's such a small nit, but...
Use self profile infrastructure for -Z time and -Z time-passes
There's no longer indentation for -Z time and -Z time-passes and duplicate timers between self profiling and -Z time-passes have been removed.
r? @wesleywiser
Use drop instead of the toilet closure `|_| ()`
…r=Manishearth
Implement uncommon_codepoints lint.
Part of rust-lang#55467 . The checks of `$crate` and `{{root}}` are very unfortunate. But i'm not sure where they belongs to.
@Dylan-DPC-zzDylan-DPC-zz added the rollup A PR which is a rollup label Jan 2, 2020
@Dylan-DPC-zz

Copy link
Copy Markdown
Author

@bors r+ rollup=never p=6

@bors

bors commented Jan 2, 2020

Copy link
Copy Markdown
Collaborator

📌 Commit 6683871 has been approved by Dylan-DPC

@borsbors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Jan 2, 2020
@Dylan-DPC-zz

Copy link
Copy Markdown
Author

@bors r- retry

@borsbors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. 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-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jan 2, 2020
@rust-highfive

Copy link
Copy Markdown
Contributor

The job x86_64-gnu-llvm-7 of your PR failed (pretty log, 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.
2020-01-02T17:51:33.7056292Z ##[command]git remote add origin https://github.com/rust-lang/rust
2020-01-02T17:51:33.7244974Z ##[command]git config gc.auto 0
2020-01-02T17:51:33.7320619Z ##[command]git config --get-all http.https://github.com/rust-lang/rust.extraheader
2020-01-02T17:51:33.7374801Z ##[command]git config --get-all http.proxy
2020-01-02T17:51:33.7508804Z ##[command]git -c http.extraheader="AUTHORIZATION: basic ***" fetch --force --tags --prune --progress --no-recurse-submodules --depth=2 origin +refs/heads/*:refs/remotes/origin/* +refs/pull/67814/merge:refs/remotes/pull/67814/merge
---
2020-01-02T18:49:10.3594307Z .................................................................................................... 1500/9469
2020-01-02T18:49:16.0234918Z .................................................................................................... 1600/9469
2020-01-02T18:49:20.8325269Z .................................................................................................... 1700/9469
2020-01-02T18:49:30.0118784Z .................................................................................................... 1800/9469
2020-01-02T18:49:37.8656993Z ..i................................................................................................. 1900/9469
2020-01-02T18:49:44.4230361Z .......................................................................................iiiii........ 2000/9469
2020-01-02T18:50:05.3977160Z .................................................................................................... 2200/9469
2020-01-02T18:50:07.7047273Z .................................................................................................... 2300/9469
2020-01-02T18:50:10.2120000Z .................................................................................................... 2400/9469
2020-01-02T18:50:16.2322419Z .................................................................................................... 2500/9469
---
2020-01-02T18:53:09.6725773Z ..................i.F.............i................................................................. 4900/9469
2020-01-02T18:53:19.4405925Z .................................................................................................... 5000/9469
2020-01-02T18:53:25.3685379Z ...............................................................i.................................... 5100/9469
2020-01-02T18:53:33.7193799Z .................................................................................................... 5200/9469
2020-01-02T18:53:41.5533200Z ..............................ii.ii...........i..................................................... 5300/9469
2020-01-02T18:53:50.9529074Z .................................................................................................... 5500/9469
2020-01-02T18:54:01.3168773Z .................................................................................................... 5600/9469
2020-01-02T18:54:08.2275709Z ..............i..................................................................................... 5700/9469
2020-01-02T18:54:14.0850953Z .................................................................................................... 5800/9469
2020-01-02T18:54:14.0850953Z .................................................................................................... 5800/9469
2020-01-02T18:54:24.4235167Z .................................................................................................... 5900/9469
2020-01-02T18:54:35.9047463Z ..ii...i..ii...........i............................................................................ 6000/9469
2020-01-02T18:54:52.3809365Z .................................................................................................... 6200/9469
2020-01-02T18:55:00.0118343Z .................................................................................................... 6300/9469
2020-01-02T18:55:00.0118343Z .................................................................................................... 6300/9469
2020-01-02T18:55:14.4758720Z .............................i..ii.................................................................. 6400/9469
2020-01-02T18:55:33.9667314Z .................................................................................................... 6600/9469
2020-01-02T18:55:35.9735919Z ....i............................................................................................... 6700/9469
2020-01-02T18:55:38.1756798Z .................................................................................................... 6800/9469
2020-01-02T18:55:40.6787624Z ....i............................................................................................... 6900/9469
---
2020-01-02T18:57:14.3782651Z .................................................................................................... 7500/9469
2020-01-02T18:57:19.0452272Z .................................................................................................... 7600/9469
2020-01-02T18:57:23.7594579Z .................................................................................................... 7700/9469
2020-01-02T18:57:34.2341070Z .................................................................................................... 7800/9469
2020-01-02T18:57:41.5396633Z ......................................iiii.......................................................... 7900/9469
2020-01-02T18:57:55.5867945Z .................................................................................................... 8100/9469
2020-01-02T18:58:03.8583948Z .................................................................................................... 8200/9469
2020-01-02T18:58:17.3030255Z .................................................................................................... 8300/9469
2020-01-02T18:58:24.9482333Z .................................................................................................... 8400/9469
---
2020-01-02T19:00:17.1530868Z 2020-01-02T19:00:17.1530894Z 2020-01-02T19:00:17.1530958Z The actual stderr differed from the expected stderr.
2020-01-02T19:00:17.1531275Z Actual stderr saved to /checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/issues/issue-48508/issue-48508.stderr
2020-01-02T19:00:17.1531559Z To update references, rerun the tests and pass the `--bless` flag
2020-01-02T19:00:17.1531826Z To only update this specific test, also pass `--test-args issues/issue-48508.rs`
2020-01-02T19:00:17.1531923Z error: 1 errors occurred comparing output.
2020-01-02T19:00:17.1531969Z status: exit code: 0
2020-01-02T19:00:17.1531969Z status: exit code: 0
2020-01-02T19:00:17.1532771Z command: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "/checkout/src/test/ui/issues/issue-48508.rs" "-Zthreads=1" "--target=x86_64-unknown-linux-gnu" "--error-format" "json" "-Zui-testing" "-C" "prefer-dynamic" "-o" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/issues/issue-48508/a" "-Crpath" "-O" "-Zunstable-options" "-Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "-g" "-L" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/issues/issue-48508/auxiliary"
2020-01-02T19:00:17.1533119Z ------------------------------------------
2020-01-02T19:00:17.1533170Z 2020-01-02T19:00:17.1533385Z ------------------------------------------
2020-01-02T19:00:17.1533431Z stderr:
---
2020-01-02T19:00:17.1599153Z thread 'main' panicked at 'Some tests failed', src/tools/compiletest/src/main.rs:385:22
2020-01-02T19:00:17.1599595Z note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace.
2020-01-02T19:00:17.1620890Z 2020-01-02T19:00:17.1620977Z 2020-01-02T19:00:17.1623199Z command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-tools-bin/compiletest" "/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" "--src-base" "/checkout/src/test/ui" "--build-base" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui" "--stage-id" "stage2-x86_64-unknown-linux-gnu" "--mode" "ui" "--target" "x86_64-unknown-linux-gnu" "--host" "x86_64-unknown-linux-gnu" "--llvm-filecheck" "/usr/lib/llvm-7/bin/FileCheck" "--host-rustcflags" "-Crpath -O -Cdebuginfo=0 -Zunstable-options -Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "--target-rustcflags" "-Crpath -O -Cdebuginfo=0 -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" "7.0.0\n" "--system-llvm" "--cc" "" "--cxx" "" "--cflags" "" "--llvm-components" "" "--llvm-cxxflags" "" "--adb-path" "adb" "--adb-test-dir" "/data/tmp/work" "--android-cross-path" "" "--color" "always"
2020-01-02T19:00:17.1623498Z 2020-01-02T19:00:17.1623762Z 2020-01-02T19:00:17.1628363Z failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test
2020-01-02T19:00:17.1628572Z Build completed unsuccessfully in 1:02:17
2020-01-02T19:00:17.1628572Z Build completed unsuccessfully in 1:02:17
2020-01-02T19:00:17.1687456Z == clock drift check ==
2020-01-02T19:00:17.1705170Z local time: Thu Jan 2 19:00:17 UTC 2020
2020-01-02T19:00:17.4607643Z network time: Thu, 02 Jan 2020 19:00:17 GMT
2020-01-02T19:00:17.4610211Z == end clock drift check ==
2020-01-02T19:00:18.6368960Z 2020-01-02T19:00:18.6487903Z ##[error]Bash exited with code '1'.
2020-01-02T19:00:18.6525366Z ##[section]Starting: Checkout
2020-01-02T19:00:18.6526944Z ==============================================================================
2020-01-02T19:00:18.6527006Z Task : Get sources
2020-01-02T19:00:18.6527047Z Description : Get sources from a repository. Supports Git, TfsVC, and SVN repositories.

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)

@CentrilCentril closed this Jan 2, 2020
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

rollupA PR which is a rollupS-waiting-on-borsStatus: 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.

9 participants

@Dylan-DPC-zz@bors@rust-highfive@Centril@taralx@tesuji@Zoxc@crlf0710@Dylan-DPC