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 4 pull requests #66449

Merged
merged 27 commits into from
Nov 15, 2019
Merged

Rollup of 4 pull requests #66449

merged 27 commits into from
Nov 15, 2019

Conversation

tmandry
Copy link
Member

@tmandry tmandry commented Nov 15, 2019

Successful merges:

Failed merges:

r? @ghost

Centril and others added 27 commits November 14, 2019 13:40
Push `ast::{ItemKind, ImplItemKind}::OpaqueTy` hack down into lowering

We currently have a hack in the form of `ast::{ItemKind, ImplItemKind}::OpaqueTy` which is constructed literally when you write `type Alias = impl Trait;` but not e.g. `type Alias = Vec<impl Trait>;`. Per rust-lang/rfcs#2515, this needs to change to allow `impl Trait` in nested positions.  This PR achieves this change for the syntactic aspect but not the semantic one, which will require changes in lowering and def collection. In the interim, `TyKind::opaque_top_hack` is introduced to avoid knock-on changes in lowering, collection, and resolve. These hacks can then be removed and fixed one by one until the desired semantics are supported.

r? @varkor
Correct `const_in_array_repeat_expressions` feature name

Fixes rust-lang#66433

r? @estebank
… r=Mark-Simulacrum

Port erased cleanup

Just realised that the changes I made in rust-lang#65965 were removed after the move of all error codes so here it is. I made them into separate commits to make the history look better this time.

r? @Mark-Simulacrum
@tmandry
Copy link
Member Author

tmandry commented Nov 15, 2019

@bors r+ p=4 rollup=never

@bors
Copy link
Contributor

bors commented Nov 15, 2019

📌 Commit 0f2f03f has been approved by tmandry

@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 Nov 15, 2019
@tmandry tmandry added the rollup A PR which is a rollup label Nov 15, 2019
@bors
Copy link
Contributor

bors commented Nov 15, 2019

⌛ Testing commit 0f2f03f with merge 1bd30ce...

bors added a commit that referenced this pull request Nov 15, 2019
Rollup of 4 pull requests

Successful merges:

 - #66197 (Push `ast::{ItemKind, ImplItemKind}::OpaqueTy` hack down into lowering)
 - #66429 (Add a regression test for #62524)
 - #66435 (Correct `const_in_array_repeat_expressions` feature name)
 - #66443 (Port erased cleanup)

Failed merges:

r? @ghost
@bors
Copy link
Contributor

bors commented Nov 15, 2019

☀️ Test successful - checks-azure
Approved by: tmandry
Pushing 1bd30ce to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Nov 15, 2019
@bors bors merged commit 0f2f03f into rust-lang:master Nov 15, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
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
Development

Successfully merging this pull request may close these issues.

5 participants