Skip to content

resolve '_ in dyn Trait just like ordinary elision #48960

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Merged
merged 1 commit into from
Mar 17, 2018

Conversation

nikomatsakis
Copy link
Contributor

@nikomatsakis nikomatsakis commented Mar 12, 2018

r? @cramertj

Fixes #48468

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Mar 12, 2018
@nikomatsakis nikomatsakis force-pushed the issue-48468-dyn-trait-elision branch from 7d9a301 to 3a5a942 Compare March 12, 2018 20:33
@cramertj
Copy link
Member

@bors r+

@bors
Copy link
Collaborator

bors commented Mar 12, 2018

📌 Commit 3a5a942 has been approved by cramertj

@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 Mar 12, 2018
@kennytm
Copy link
Member

kennytm commented Mar 14, 2018

@bors r-

The UI tests in this PR will be broken by the rephrasing in #48684. Please rebase and update src/test/ui/underscore-lifetime/dyn-trait-underscore.stderr. The last line should read

For more information about this error, try `rustc --explain E0495`.

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Mar 14, 2018
@nikomatsakis
Copy link
Contributor Author

Boo. OK =)

@nikomatsakis nikomatsakis force-pushed the issue-48468-dyn-trait-elision branch from 3a5a942 to f9bf827 Compare March 14, 2018 23:39
@nikomatsakis
Copy link
Contributor Author

@bors r=cramertj

@bors
Copy link
Collaborator

bors commented Mar 15, 2018

📌 Commit f9bf827 has been approved by cramertj

@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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Mar 15, 2018
kennytm added a commit to kennytm/rust that referenced this pull request Mar 17, 2018
…elision, r=cramertj

resolve `'_` in `dyn Trait` just like ordinary elision

r? @cramertj

Fixes rust-lang#48468
bors added a commit that referenced this pull request Mar 17, 2018
Rollup of 8 pull requests

- Successful merges: #48943, #48960, #48983, #49055, #49057, #49077, #49082, #49083
- Failed merges:
@bors bors merged commit f9bf827 into rust-lang:master Mar 17, 2018
# for free to join this conversation on GitHub. Already have an account? # 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.

5 participants