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.

Sign up for GitHub

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

Jump to bottom

Rollup of 4 pull requests #61962

Merged
merged 8 commits into from
Jun 19, 2019
Merged

Rollup of 4 pull requests #61962

merged 8 commits into from
Jun 19, 2019

Conversation

Centril
Copy link
Contributor

@Centril Centril commented Jun 19, 2019

Successful merges:

Failed merges:

r? @ghost

spastorino and others added 8 commits June 18, 2019 22:06
@spastorino
Make Place::ty iterate
f4737d5
@oli-obk
Add functions to build raw slices
8b21b07
@petrochenkov
Support cfg and cfg_attr on generic parameters
0b58bb3
@topecongiro
Update rustfmt and rls
5a411a6 
Update rustfmt to 1.3.0.
@Centril
Rollup merge of rust-lang#60667 - oli-obk:raw_from_raw_parts, r=sfackler
564326a 
 Add functions for building raw slices to libcore

implement rust-lang#36925
@Centril
Rollup merge of rust-lang#61547 - petrochenkov:cfgen, r=Centril
7b3984b 
Support `cfg` and `cfg_attr` on generic parameters

`cfg` attributes are supported in all other positions where attributes are accepted at all.

They were previously prohibited in rust-lang#51283 because they weren't implemented correctly before that and were simply ignored.
@Centril
Rollup merge of rust-lang#61861 - topecongiro:rustfmt-1.3.0, r=topeco…
d88b7b2 
…ngiro

Update rustfmt and rls

This PR bumps the version of rustfmt to 1.3.0.
@Centril
Rollup merge of rust-lang#61940 - spastorino:place-ty-iterate, r=oli-obk
bf6c505 
Make Place::ty iterate

r? @oli-obk

Related to Place 2.0
@Centril
Copy link
Contributor Author

Centril commented Jun 19, 2019

@bors r+ p=4

@bors
Copy link
Contributor

bors commented Jun 19, 2019

📌 Commit bf6c505 has been approved by Centril

@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 Jun 19, 2019
@bors
Copy link
Contributor

bors commented Jun 19, 2019

⌛ Testing commit bf6c505 with merge c66f28fb7423bb88883528b82969d2098a89c700...

@Centril Centril mentioned this pull request Jun 19, 2019
Merged
@bors
Copy link
Contributor

bors commented Jun 19, 2019

💔 Test failed - checks-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 Jun 19, 2019
@rust-highfive
Copy link
Collaborator

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. 
Attempting to download https://rust-lang-ci-sccache2.s3.amazonaws.com/docker/eb70c6d02a75cdd10800aec521e3d88a4ccc07be26a0174fd0272bd18f356ea416acf3708b0fa3393b5147a52759b8914811d46d34150eb8b91512c026d7a4b6
[00:07:52] Attempting with retry: curl -y 30 -Y 10 --connect-timeout 30 -f -L -C - -o /tmp/rustci_docker_cache https://rust-lang-ci-sccache2.s3.amazonaws.com/docker/eb70c6d02a75cdd10800aec521e3d88a4ccc07be26a0174fd0272bd18f356ea416acf3708b0fa3393b5147a52759b8914811d46d34150eb8b91512c026d7a4b6
[00:07:52]   % Total    % Received % Xferd  Average Speed   Time    Time     Time  Current
[00:07:52]                                  Dload  Upload   Total   Spent    Left  Speed
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)

@Centril
Copy link
Contributor Author

Centril commented Jun 19, 2019

@bors retry No output has been received in the last 30m0s

@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 Jun 19, 2019
@bors
Copy link
Contributor

bors commented Jun 19, 2019

⌛ Testing commit bf6c505 with merge 5e0c6a6...

bors added a commit that referenced this pull request Jun 19, 2019
@bors
Auto merge of #61962 - Centril:rollup-y6sg1zw, r=Centril
5e0c6a6 
Rollup of 4 pull requests

Successful merges:

 - #60667 ( Add functions for building raw slices to libcore )
 - #61547 (Support `cfg` and `cfg_attr` on generic parameters)
 - #61861 (Update rustfmt and rls)
 - #61940 (Make Place::ty iterate)

Failed merges:

r? @ghost
@bors
Copy link
Contributor

bors commented Jun 19, 2019

☀️ Test successful - checks-travis, status-appveyor
Approved by: Centril
Pushing 5e0c6a6 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jun 19, 2019
@bors bors merged commit bf6c505 into rust-lang:master Jun 19, 2019
@Centril Centril deleted the rollup-y6sg1zw branch June 20, 2019 03:47
@mati865 mati865 mentioned this pull request Jul 10, 2019
Closed
@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
Reviewers
No reviews
Assignees
No one assigned
Labels
merged-by-bors This PR was explicitly merged by bors. 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
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@Centril @bors @rust-highfive @spastorino @oli-obk @petrochenkov @topecongiro