Skip to content

use the correct supertrait substitution in object_ty_for_trait - #57355

Merged
bors merged 1 commit into
rust-lang:masterfrom
arielb1:correct-subst
Jan 11, 2019
Merged

use the correct supertrait substitution in object_ty_for_trait#57355
bors merged 1 commit into
rust-lang:masterfrom
arielb1:correct-subst

Conversation

@arielb1

Copy link
Copy Markdown
Contributor

beta-nominating because regression.

Fixes#57156.

@arielb1arielb1 added the beta-nominated Nominated for backporting to the compiler in the beta channel. label Jan 5, 2019
@arielb1

Copy link
Copy Markdown
ContributorAuthor

r? @nikomatsakis

@rust-highfive

Copy link
Copy Markdown
Contributor

r? @michaelwoerister

(rust_highfive has picked a reviewer for you, use r? to override)

@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jan 5, 2019
@nikomatsakis

Copy link
Copy Markdown
Contributor

@bors r+

@bors

bors commented Jan 8, 2019

Copy link
Copy Markdown
Collaborator

📌 Commit 85c4b4c has been approved by nikomatsakis

@borsbors 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 Jan 8, 2019
@nikomatsakisnikomatsakis added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Jan 8, 2019
@emilyalbini

Copy link
Copy Markdown
Member

@bors p=1 (beta nominated)

@bors

bors commented Jan 10, 2019

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 85c4b4c with merge b0b3e7eee6cb6b2c076e35793200229c678e85d5...

@bors

bors commented Jan 10, 2019

Copy link
Copy Markdown
Collaborator

💥 Test timed out

@borsbors 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 10, 2019
@emilyalbini

Copy link
Copy Markdown
Member

@bors retry

Wut.

@borsbors 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 Jan 10, 2019
@bors

bors commented Jan 10, 2019

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 85c4b4c with merge 627e72124c18c97d4d0ce54788b05c66ee3d585a...

@bors

bors commented Jan 10, 2019

Copy link
Copy Markdown
Collaborator

💔 Test failed - checks-travis

@borsbors removed the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Jan 10, 2019
@nikomatsakis

Copy link
Copy Markdown
Contributor

Discussed in the @rust-lang/compiler meeting. This is acccepted for backport, however we would like to see it land on nightly first and ideally have a bit of "airtime". Since this is next in the queue, this seems likely to happen.

@bors p=22 -- to help ensure it stays high in the queue =)

@Xanewok

Copy link
Copy Markdown
Contributor

Just a heads up, I'm not sure bors accepts comments after p= (seems to still be p=1 according to https://buildbot2.rust-lang.org/homu/queue/rust)

@varkor

Copy link
Copy Markdown
Contributor

@bors p=22

@Mark-Simulacrum

Copy link
Copy Markdown
Member

Cc @rust-lang/release @pietroalbini - could we prepare a beta PR with this included?

@CentrilCentril added the beta-accepted Accepted for backporting to the compiler in the beta channel. label Jan 11, 2019
@bors

bors commented Jan 11, 2019

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 85c4b4c with merge 7a232f19bff4a3fdb2daaeac2fa95d1a0dfdf2ab...

@bors

bors commented Jan 11, 2019

Copy link
Copy Markdown
Collaborator

💔 Test failed - checks-travis

@borsbors 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 11, 2019
@rust-highfive

Copy link
Copy Markdown
Contributor

The job dist-x86_64-apple 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.
[00:03:17] Memory: 8 GB
[00:03:17] Boot ROM Version: VMW71.00V.0.B64.1704110547
[00:03:17] Apple ROM Info: [MS_VM_CERT/SHA1/27d66596a61c48dd3dc7216fd715126e33f59ae7]Welcome to the Virtual Machine
[00:03:17] SMC Version (system): 2.8f0
[00:03:17] Serial Number (system): VMVK3nIN5xiN
[00:03:17] [00:03:17] hw.ncpu: 4
[00:03:17] hw.byteorder: 1234
[00:03:17] hw.memsize: 8589934592
---
[02:49:18] travis_time:end:stage2-cargo-miri:start=1547186792385658000,finish=1547186792990559000,duration=604901000
[02:49:18] [TIMING] ToolBuild { compiler: Compiler { stage: 2, host: "x86_64-apple-darwin" }, target: "x86_64-apple-darwin", tool: "cargo-miri", path: "src/tools/miri", mode: ToolRustc, is_optional_tool: true, source_type: Submodule, extra_features: [] } -- 0.634
[02:49:20] [TIMING] Miri { stage: 2, target: "x86_64-apple-darwin" } -- 1.507
The job exceeded the maximum time limit for jobs, and 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
Copy Markdown
Contributor

Seems spurious...

@bors retry

@borsbors 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 Jan 11, 2019
@bors

bors commented Jan 11, 2019

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 85c4b4c with merge d7e205a...

bors added a commit that referenced this pull request Jan 11, 2019
use the correct supertrait substitution in `object_ty_for_trait`
beta-nominating because regression.
Fixes#57156.
@bors

bors commented Jan 11, 2019

Copy link
Copy Markdown
Collaborator

💔 Test failed - checks-travis

@rust-highfive

Copy link
Copy Markdown
Contributor

The job dist-x86_64-apple 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.
[00:03:24] Memory: 8 GB
[00:03:24] Boot ROM Version: VMW71.00V.0.B64.1704110547
[00:03:24] Apple ROM Info: [MS_VM_CERT/SHA1/27d66596a61c48dd3dc7216fd715126e33f59ae7]Welcome to the Virtual Machine
[00:03:24] SMC Version (system): 2.8f0
[00:03:24] Serial Number (system): VMC5JjdUGh9r
[00:03:24] [00:03:24] hw.ncpu: 4
[00:03:24] hw.byteorder: 1234
[00:03:24] hw.memsize: 8589934592
---
[02:50:57] travis_fold:start:stage2-cargo-fmt
travis_time:start:stage2-cargo-fmt
Building stage2 tool cargo-fmt (x86_64-apple-darwin)
[02:50:57] Compiling rustfmt-nightly v1.0.1 (/Users/travis/build/rust-lang/rust/src/tools/rustfmt)
The job exceeded the maximum time limit for jobs, and 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)

@borsbors 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 11, 2019
@kennytm

Copy link
Copy Markdown
Member

@bors retry

@borsbors 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 Jan 11, 2019
@bors

bors commented Jan 11, 2019

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 85c4b4c with merge 88f19a7...

bors added a commit that referenced this pull request Jan 11, 2019
use the correct supertrait substitution in `object_ty_for_trait`
beta-nominating because regression.
Fixes#57156.
@bors

bors commented Jan 11, 2019

Copy link
Copy Markdown
Collaborator

☀️ Test successful - checks-travis, status-appveyor
Approved by: nikomatsakis
Pushing 88f19a7 to master...

@bors
bors merged commit 85c4b4c into rust-lang:masterJan 11, 2019
@emilyalbiniemilyalbini mentioned this pull request Jan 11, 2019
@emilyalbiniemilyalbini removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Jan 11, 2019
bors added a commit that referenced this pull request Jan 11, 2019
[beta] Rollup backports
Cherry-picked:
* #57355: use the correct supertrait substitution in `object_ty_for_trait`
* #57471: Updated RELEASES.md for 1.32.0
Rolled up:
* #57483: [beta] Uniform path backports
* c658d73: resolve: Avoid "self-confirming" resolutions in import validation
* #57160: resolve: Fix an ICE in import validation
* #56759: Stabilize `uniform_paths`
r? @ghost
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

beta-acceptedAccepted for backporting to the compiler in the beta channel.S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-compilerRelevant to the compiler team, which will review and decide on the PR/issue.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

11 participants

@arielb1@rust-highfive@nikomatsakis@bors@emilyalbini@Xanewok@varkor@Mark-Simulacrum@Centril@kennytm@michaelwoerister