Skip to content

Conversation

eddyb
Copy link
Member

@eddyb eddyb commented Jan 31, 2018

This PR provides tcx.layout_of(param_env.and(ty)) as the idiomatic replacement for the existing (tcx, param_env).layout_of(ty) and removes fragile (coherence-wise) layout-related tuple impls.

r? @nikomatsakis

@kennytm kennytm added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Feb 1, 2018
@nikomatsakis
Copy link
Contributor

@bors r+

@bors
Copy link
Collaborator

bors commented Feb 1, 2018

📌 Commit 9c3dc7e has been approved by nikomatsakis

@nikomatsakis nikomatsakis 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 Feb 1, 2018
@kennytm
Copy link
Member

kennytm commented Feb 3, 2018

@bors p=1

(move more complex PRs forward)

@bors
Copy link
Collaborator

bors commented Feb 3, 2018

⌛ Testing commit 9c3dc7e with merge 0e1741ed4f8b459407718a6f1babdbbb0fc247ce...

@bors
Copy link
Collaborator

bors commented Feb 4, 2018

💔 Test failed - status-appveyor

@eddyb
Copy link
Member Author

eddyb commented Feb 4, 2018

@bors retry

Is this a known timeout issue?

@bors
Copy link
Collaborator

bors commented Feb 4, 2018

⌛ Testing commit 9c3dc7e with merge 9af374a...

bors added a commit that referenced this pull request Feb 4, 2018
rustc: prefer ParamEnvAnd and LayoutCx over tuples for LayoutOf.

This PR provides `tcx.layout_of(param_env.and(ty))` as the idiomatic replacement for the existing `(tcx, param_env).layout_of(ty)` and removes fragile (coherence-wise) layout-related tuple impls.

r? @nikomatsakis
@bors
Copy link
Collaborator

bors commented Feb 4, 2018

☀️ Test successful - status-appveyor, status-travis
Approved by: nikomatsakis
Pushing 9af374a to master...

@bors bors merged commit 9c3dc7e into rust-lang:master Feb 4, 2018
@bors bors mentioned this pull request Feb 4, 2018
@kennytm
Copy link
Member

kennytm commented Feb 4, 2018

(BTW, the previous timeout was due to 1h 42m spent on cloning binaryen.

[00:01:08] Cloning into '/c/cache/rustsrc/src/src/binaryen'...
[01:43:33] error: RPC failed; curl 18 transfer closed with outstanding read data remaining

)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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.

4 participants