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

Rollup of 5 pull requests #67815

Closed
wants to merge 11 commits into from

Conversation

Dylan-DPC-zz
Copy link

Successful merges:

Failed merges:

r? @ghost

semarie and others added 11 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...
…lett

Add missing links for insecure_time
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 `|_| ()`
@Dylan-DPC-zz Dylan-DPC-zz added the rollup A PR which is a rollup label Jan 2, 2020
@Dylan-DPC-zz
Copy link
Author

@bors r+ rollup=never p=5

@bors
Copy link
Contributor

bors commented Jan 2, 2020

📌 Commit 061d200 has been approved by Dylan-DPC

@bors bors 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
@bors
Copy link
Contributor

bors commented Jan 2, 2020

⌛ Testing commit 061d200 with merge 3636376...

bors added a commit that referenced this pull request Jan 2, 2020
Rollup of 5 pull requests

Successful merges:

 - #67636 (allow rustfmt key in [build] section)
 - #67736 (Less-than is asymmetric, not antisymmetric)
 - #67762 (Add missing links for insecure_time)
 - #67777 (Use self profile infrastructure for -Z time and -Z time-passes)
 - #67807 (Use drop instead of the toilet closure `|_| ()`)

Failed merges:

r? @ghost
@rust-highfive
Copy link
Collaborator

The job i686-mingw-1 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-02T20:11:45.4895874Z do so (now or later) by using -b with the checkout command again. Example:
2020-01-02T20:11:45.4895918Z 
2020-01-02T20:11:45.4895988Z   git checkout -b <new-branch-name>
2020-01-02T20:11:45.4897210Z 
2020-01-02T20:11:45.4897311Z HEAD is now at 36363765f Auto merge of #67815 - Dylan-DPC:rollup-4seh8mx, r=Dylan-DPC
2020-01-02T20:11:45.5336312Z ##[section]Starting: Setup environment
2020-01-02T20:11:45.5448823Z ==============================================================================
2020-01-02T20:11:45.5448916Z Task         : Bash
2020-01-02T20:11:45.5449008Z Description  : Run a Bash script on macOS, Linux, or Windows
---
2020-01-02T22:13:56.3148451Z 
2020-01-02T22:13:56.3148494Z 
2020-01-02T22:13:56.3618053Z failed to run: D:\a\1\s\build\bootstrap\debug\bootstrap test --exclude src/test/ui --exclude src/test/compile-fail
2020-01-02T22:13:56.3618300Z Build completed unsuccessfully in 1:51:53
2020-01-02T22:13:56.4174342Z make: *** [Makefile:89: ci-mingw-subset-1] Error 1
2020-01-02T22:13:56.4793147Z   local time: Thu Jan  2 22:13:56 CUT 2020
2020-01-02T22:13:57.0399582Z   network time: Thu, 02 Jan 2020 22:13:57 GMT
2020-01-02T22:13:57.0399733Z == end clock drift check ==
2020-01-02T22:13:57.0839607Z 
2020-01-02T22:13:57.0839607Z 
2020-01-02T22:13:57.3899359Z ##[error]Bash exited with code '2'.
2020-01-02T22:13:57.4729075Z ##[section]Starting: Checkout
2020-01-02T22:13:57.5899077Z ==============================================================================
2020-01-02T22:13:57.5899253Z Task         : Get sources
2020-01-02T22:13:57.5899347Z 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)

@bors
Copy link
Contributor

bors commented Jan 2, 2020

💔 Test failed - checks-azure

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jan 2, 2020
@Dylan-DPC-zz
Copy link
Author

Failed (could be spurious but waiting on the new rollup to confirm)

@Dylan-DPC-zz Dylan-DPC-zz deleted the rollup-4seh8mx branch January 3, 2020 09:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
rollup A PR which is a rollup S-waiting-on-review Status: Awaiting review from the assignee but also interested parties.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

8 participants