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

Allow both explicit and elided lifetimes in the same impl header #54458

Merged
merged 1 commit into from Oct 3, 2018

Conversation

Projects
None yet
6 participants
@scottmcm
Member

scottmcm commented Sep 22, 2018

While still prohibiting explicit and in-band in the same header.

Fixes #54456

As usual, I don't know the broader context of the code I'm changing, so please let me know whatever I can do better.

Pre-existing test that mixing explicit and in-band remains an error: https://github.com/rust-lang/rust/blob/master/src/test/ui/in-band-lifetimes/E0688.rs

Allow both explicit and elided lifetimes in the same impl header
(While still prohibiting explicit and in-band in the same header.)
@rust-highfive

This comment has been minimized.

Show comment
Hide comment
@rust-highfive

rust-highfive Sep 22, 2018

Collaborator

r? @michaelwoerister

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

Collaborator

rust-highfive commented Sep 22, 2018

r? @michaelwoerister

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

@Aaronepower

This comment has been minimized.

Show comment
Hide comment
@Aaronepower

Aaronepower Sep 26, 2018

Contributor

Triage; @michaelwoerister Hello, are you able to get back to this PR?

Contributor

Aaronepower commented Sep 26, 2018

Triage; @michaelwoerister Hello, are you able to get back to this PR?

@michaelwoerister

This comment has been minimized.

Show comment
Hide comment
@michaelwoerister

michaelwoerister Sep 29, 2018

Contributor

Sorry for not responding earlier!
r? @nikomatsakis for re-assignment. I know too little about this.

Contributor

michaelwoerister commented Sep 29, 2018

Sorry for not responding earlier!
r? @nikomatsakis for re-assignment. I know too little about this.

@nikomatsakis

This comment has been minimized.

Show comment
Hide comment
@nikomatsakis

nikomatsakis Oct 2, 2018

Contributor

Seems pretty reasonable.

Contributor

nikomatsakis commented Oct 2, 2018

Seems pretty reasonable.

@nikomatsakis

This comment has been minimized.

Show comment
Hide comment
@nikomatsakis

nikomatsakis Oct 2, 2018

Contributor

@bors r+

Contributor

nikomatsakis commented Oct 2, 2018

@bors r+

@bors

This comment has been minimized.

Show comment
Hide comment
@bors

bors Oct 2, 2018

Contributor

📌 Commit 003c4ff has been approved by nikomatsakis

Contributor

bors commented Oct 2, 2018

📌 Commit 003c4ff has been approved by nikomatsakis

pietroalbini added a commit to pietroalbini/rust that referenced this pull request Oct 2, 2018

Rollup merge of #54458 - scottmcm:bug-54456, r=nikomatsakis
Allow both explicit and elided lifetimes in the same impl header

While still prohibiting explicit and in-band in the same header.

Fixes #54456

As usual, I don't know the broader context of the code I'm changing, so please let me know whatever I can do better.

Pre-existing test that mixing explicit and in-band remains an error: https://github.com/rust-lang/rust/blob/master/src/test/ui/in-band-lifetimes/E0688.rs

bors added a commit that referenced this pull request Oct 2, 2018

Auto merge of #54767 - pietroalbini:rollup, r=pietroalbini
Rollup of 10 pull requests

Successful merges:

 - #54269 (#53840: Consolidate pattern check errors)
 - #54458 (Allow both explicit and elided lifetimes in the same impl header)
 - #54603 (Add `crate::` to trait suggestions in Rust 2018.)
 - #54648 (Update Cargo's submodule)
 - #54680 (make run-pass tests with empty main just compile-pass tests)
 - #54687 (Use impl_header_lifetime_elision in libcore)
 - #54699 (Re-export `getopts` so custom drivers can reference it.)
 - #54702 (do not promote comparing function pointers)
 - #54728 (Renumber `proc_macro` tracking issues)
 - #54745 (make `CStr::from_bytes_with_nul_unchecked()` a const fn)

Failed merges:

r? @ghost

@bors bors merged commit 003c4ff into rust-lang:master Oct 3, 2018

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment