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 9 pull requests #54969

Merged
merged 24 commits into from
Oct 11, 2018
Merged

Rollup of 9 pull requests #54969

merged 24 commits into from
Oct 11, 2018

Conversation

Manishearth
Copy link
Member

Successful merges:

Failed merges:

r? @ghost

@Manishearth
Copy link
Member Author

@bors r+ p=100

@bors
Copy link
Contributor

bors commented Oct 10, 2018

📌 Commit 5bc2cca1a0028f8fbd284b1b4102d9f84e4a1d57 has been approved by Manishearth

@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 Oct 10, 2018
@bors
Copy link
Contributor

bors commented Oct 10, 2018

⌛ Testing commit 5bc2cca1a0028f8fbd284b1b4102d9f84e4a1d57 with merge facfab42cd578fc94c1a362dcf9a24dc5db48328...

@bors
Copy link
Contributor

bors commented Oct 10, 2018

💔 Test failed - status-appveyor

@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 Oct 10, 2018
@bors
Copy link
Contributor

bors commented Oct 10, 2018

📌 Commit be64bf3 has been approved by Manishearth

@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 Oct 10, 2018
@bors
Copy link
Contributor

bors commented Oct 11, 2018

⌛ Testing commit be64bf3 with merge 74f9a11...

bors added a commit that referenced this pull request Oct 11, 2018
Rollup of 9 pull requests

Successful merges:

 - #54747 (codegen_llvm: verify that inline assembly operands are scalars)
 - #54848 (Better Diagnostic for Trait Object Capture)
 - #54850 (Fix #54707 - parse_trait_item_ now handles interpolated blocks as function body decls)
 - #54858 (second round of refactorings for universes)
 - #54862 (Implement RFC 2539: cfg_attr with multiple attributes)
 - #54869 (Fix mobile docs)
 - #54870 (Stabilize tool lints)
 - #54893 (Fix internal compiler error on malformed match arm pattern.)
 - #54904 (Stabilize the `Option::replace` method)

Failed merges:

 - #54909 ( Add chalk rules related to associated type defs)

r? @ghost
@bors
Copy link
Contributor

bors commented Oct 11, 2018

💔 Test failed - status-travis

@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 Oct 11, 2018
@rust-highfive
Copy link
Collaborator

The job arm-android 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% |████████████████████████████████| 61kB 8.2MB/s 
Collecting botocore==1.12.21 (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/2f/1a/802af8dba189138768281b0278cec9bfed0025b5cc64de5cf1d1e5f271b3/botocore-1.12.21-py2.py3-none-any.whl (4.7MB)
    0% |                                | 10kB 42.1MB/s eta 0:00:01
    0% |▏                               | 20kB 37.9MB/s eta 0:00:01
    0% |▏                               | 30kB 41.2MB/s eta 0:00:01
    0% |▎                               | 40kB 22.8MB/s eta 0:00:01
---
[01:39:29] test time::tests::system_time_elapsed ... ok
[01:39:29] test time::tests::system_time_math ... ok
[01:39:34] test sync::mpsc::tests::stress_recv_timeout_two_threads ... ok
[01:39:36] test collections::hash::map::test_map::test_lots_of_insertions ... ok
[01:40:10] test process::tests::test_process_output_fail_to_start ... test process::tests::test_process_output_fail_to_start has been running for over 60 seconds
No output has been received in the last 30m0s, this potentially indicates a stalled build or something wrong with the build itself.
Check the details on how to adjust your build configuration on: https://docs.travis-ci.com/user/common-build-problems/#Build-times-out-because-no-output-was-received
The build has been terminated

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)

@kennytm
Copy link
Member

kennytm commented Oct 11, 2018

@bors retry

@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 Oct 11, 2018
@bors
Copy link
Contributor

bors commented Oct 11, 2018

⌛ Testing commit be64bf3 with merge cb6eedd...

bors added a commit that referenced this pull request Oct 11, 2018
Rollup of 9 pull requests

Successful merges:

 - #54747 (codegen_llvm: verify that inline assembly operands are scalars)
 - #54848 (Better Diagnostic for Trait Object Capture)
 - #54850 (Fix #54707 - parse_trait_item_ now handles interpolated blocks as function body decls)
 - #54858 (second round of refactorings for universes)
 - #54862 (Implement RFC 2539: cfg_attr with multiple attributes)
 - #54869 (Fix mobile docs)
 - #54870 (Stabilize tool lints)
 - #54893 (Fix internal compiler error on malformed match arm pattern.)
 - #54904 (Stabilize the `Option::replace` method)

Failed merges:

 - #54909 ( Add chalk rules related to associated type defs)

r? @ghost
@bors
Copy link
Contributor

bors commented Oct 11, 2018

☀️ Test successful - status-appveyor, status-travis
Approved by: Manishearth
Pushing cb6eedd to master...

@bors bors merged commit be64bf3 into rust-lang:master Oct 11, 2018
@rust-highfive
Copy link
Collaborator

📣 Toolstate changed by #54969!

Tested on commit cb6eedd.
Direct link to PR: #54969

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

@kumbayo
Copy link

kumbayo commented Oct 11, 2018

@Manishearth It looks like there is something strange happening in this kind of rollup merges.

This rollup consists of multiple merge commits.
a267b3a
8ebc6d6
50e410c
e1e628e
ff3e4d9
be64bf3

All this merge commits seem to have the same commit message body unrelated to the actual thing being merged:

Fixes #47311.
r? @nrc

This usage of the same commit message body seems to go back to Feb 2018 as it can be seen in #47311.
The commit message title is unique for each merge and looks correct.

Do you have some idea what is going on here?
Are this commit messages created by a script doing the rollup merges?

@Manishearth
Copy link
Member Author

Oh, shoot. Yeah, I used a script since it's easier to handle, looks like something on the github side changed .

Thanks for noticing, will fix up my script!

@Manishearth Manishearth deleted the rollup branch October 11, 2018 17:04
@Centril Centril added the rollup A PR which is a rollup label Oct 2, 2019
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-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.

Creating a trait function with a macro using block designator: error: expected ; or {, found { ... }