Skip to content

Don't assert for different instance on impl trait alias - #65753

Merged
bors merged 1 commit into
rust-lang:masterfrom
csmoe:derive_fold
Oct 25, 2019
Merged

Don't assert for different instance on impl trait alias#65753
bors merged 1 commit into
rust-lang:masterfrom
csmoe:derive_fold

Conversation

@csmoe

@csmoecsmoe commented Oct 24, 2019

Copy link
Copy Markdown
Contributor

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

Centril commented Oct 24, 2019

Copy link
Copy Markdown
Contributor

Adding the two tests from the issue would be good. :)

mati865
mati865 reviewed Oct 24, 2019
View reviewed changes
Comment threadsrc/librustc_typeck/check/mod.rs Outdated
Centril
Centril reviewed Oct 24, 2019
View reviewed changes
Comment threadsrc/test/ui/type-alias-impl-trait/issue-65679.rs Outdated
@CentrilCentril added the F-type_alias_impl_trait `#[feature(type_alias_impl_trait)]` label Oct 24, 2019
Centril
Centril reviewed Oct 24, 2019
View reviewed changes

@CentrilCentril left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

r=me with these final nits fixed.

Comment threadsrc/test/ui/type-alias-impl-trait/issue-65679-inst-opaque-ty-from-val-twice.rs Outdated
Comment threadsrc/test/ui/type-alias-impl-trait/issue-65679-inst-opaque-ty-from-val-twice.rs Outdated
@csmoe

csmoe commented Oct 24, 2019•
edited
Loading

Copy link
Copy Markdown
ContributorAuthor

r=@Centril

@Centril

Centril commented Oct 24, 2019

Copy link
Copy Markdown
Contributor

@bors r+ rollup

@bors

bors commented Oct 24, 2019

Copy link
Copy Markdown
Collaborator

📌 Commit ab8c4d3c9845011b50726161ba9fb81ebf901694 has been approved by Centril

@bors

bors commented Oct 24, 2019

Copy link
Copy Markdown
Collaborator

🌲 The tree is currently closed for pull requests below priority 1000, this pull request will be tested once the tree is reopened

@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 Oct 24, 2019
@csmoe

csmoe commented Oct 24, 2019•
edited
Loading

Copy link
Copy Markdown
ContributorAuthor

r=@Centril

(sorry for tidy error)

@Centril

Centril commented Oct 24, 2019

Copy link
Copy Markdown
Contributor

@bors r+ rollup

@bors

bors commented Oct 24, 2019

Copy link
Copy Markdown
Collaborator

📌 Commit 184a61f has been approved by Centril

@bors

bors commented Oct 24, 2019

Copy link
Copy Markdown
Collaborator

🌲 The tree is currently closed for pull requests below priority 1000, this pull request will be tested once the tree is reopened

Centril added a commit to Centril/rust that referenced this pull request Oct 24, 2019
@Centril
Rollup merge ofrust-lang#65753- csmoe:derive_fold, r=Centril
6653c77
Don't assert for different instance on impl trait alias
Closesrust-lang#65679
r? @Centril@nikomatsakis
@CentrilCentril mentioned this pull request Oct 24, 2019
Closed
Centril added a commit to Centril/rust that referenced this pull request Oct 24, 2019
@Centril
Rollup merge ofrust-lang#65753- csmoe:derive_fold, r=Centril
1b03671
Don't assert for different instance on impl trait alias
Closesrust-lang#65679
r? @Centril@nikomatsakis
@CentrilCentril mentioned this pull request Oct 24, 2019
Merged
bors added a commit that referenced this pull request Oct 25, 2019
@bors
Auto merge of#65771- Centril:rollup-upfsvrb, r=Centril
d54111a
Rollup of 8 pull requests
Successful merges:
- #65625 (Turn crate store into a resolver output)
- #65627 (Forbid non-`structural_match` types in const generics)
- #65710 (Update cargo)
- #65729 (Update test cases for vxWorks)
- #65746 (Tweak format string error to point at arguments always)
- #65753 (Don't assert for different instance on impl trait alias)
- #65755 (Avoid ICE when adjusting bad self ty)
- #65766 (Update hashbrown to 0.6.2)
Failed merges:
r? @ghost
@bors
bors merged commit 184a61f into rust-lang:masterOct 25, 2019
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@mati865mati865mati865 left review comments
+1 more reviewer
@CentrilCentrilCentril left review comments
Reviewers whose approvals may not affect merge requirements

Assignees

@CentrilCentril

Labels

F-type_alias_impl_trait`#[feature(type_alias_impl_trait)]`S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.

Projects

type alias impl trait stabilization
Status: Done

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

ICE when aliasing impl Future

5 participants

@csmoe@Centril@bors@mati865@rust-highfive