Skip to content

Extract impl_header_lifetime_elision out of in_band_lifetimes#53016

Merged
bors merged 3 commits into
rust-lang:masterfrom
scottmcm:impl-header-lifetime-elision
Aug 7, 2018
Merged

Extract impl_header_lifetime_elision out of in_band_lifetimes#53016
bors merged 3 commits into
rust-lang:masterfrom
scottmcm:impl-header-lifetime-elision

Conversation

@scottmcm

@scottmcm scottmcm commented Aug 3, 2018

Copy link
Copy Markdown
Member

This way we can experiment with impl Debug for &MyType separately from impl Debug for &'a MyType.

I can't say I know what the code in here is doing, so please let me know if there's a better way 🙂

I marked this as enabled in 2018 so that edition code continues to work without another flag.

Actual feature PR #49251; Tracking Issue #15872; In-band lifetimes tracking issue #44524.

cc @aturon, per discussion on discord earlier
cc @cramertj & @nikomatsakis, who actually wrote these features

@rust-highfive

Copy link
Copy Markdown
Contributor

r? @pnkfelix

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

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Aug 3, 2018
@rust-highfive

This comment has been minimized.

@pnkfelix

pnkfelix commented Aug 3, 2018

Copy link
Copy Markdown
Contributor

unassigning self as i'm about to go on PTO

@pnkfelix pnkfelix removed their assignment Aug 3, 2018
@pnkfelix

pnkfelix commented Aug 3, 2018

Copy link
Copy Markdown
Contributor

r? @nikomatsakis

(who I assume will have good sense to delegate accordingly if necessary)

As mentioned in the 2018-08-04 edition status update, these are postponed as lacking consensus to stabilize.
@scottmcm

scottmcm commented Aug 4, 2018

Copy link
Copy Markdown
Member Author

I included a commit here (1c7af27) to remove in-band lifetimes from being automatically-on in the 2018 edition since it seems like that's wanted for edition preview 2 (cc @Centril).

@nikomatsakis nikomatsakis 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.

I have a nit, but it hardly matters

@@ -718,6 +720,10 @@ impl<'a> LoweringContext<'a> {
return;
}

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.

seems like we could remove this if, as it serves no purpose now

@nikomatsakis

Copy link
Copy Markdown
Contributor

@bors r+

@bors

bors commented Aug 6, 2018

Copy link
Copy Markdown
Collaborator

📌 Commit 1c7af27 has been approved by nikomatsakis

@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 Aug 6, 2018
@nikomatsakis

Copy link
Copy Markdown
Contributor

@bors p=1

Giving higher priority because this is an EP2 blocker

@bors

bors commented Aug 6, 2018

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 1c7af27 with merge 45a9d41...

bors added a commit that referenced this pull request Aug 6, 2018
…atsakis

Extract impl_header_lifetime_elision out of in_band_lifetimes

This way we can experiment with `impl Debug for &MyType` separately from `impl Debug for &'a MyType`.

I can't say I know what the code in here is doing, so please let me know if there's a better way 🙂

I marked this as enabled in 2018 so that edition code continues to work without another flag.

Actual feature PR #49251; Tracking Issue #15872; In-band lifetimes tracking issue #44524.

cc @aturon, per discussion on discord earlier
cc @cramertj & @nikomatsakis, who actually wrote these features
@bors

bors commented Aug 7, 2018

Copy link
Copy Markdown
Collaborator

☀️ Test successful - status-appveyor, status-travis
Approved by: nikomatsakis
Pushing 45a9d41 to master...

@bors bors merged commit 1c7af27 into rust-lang:master Aug 7, 2018
@rust-highfive

Copy link
Copy Markdown
Contributor

📣 Toolstate changed by #53016!

Tested on commit 45a9d41.
Direct link to PR: #53016

💔 clippy-driver on windows: test-fail → build-fail (cc @Manishearth @llogiq @mcarton @oli-obk, @rust-lang/infra).
💔 clippy-driver on linux: test-fail → build-fail (cc @Manishearth @llogiq @mcarton @oli-obk, @rust-lang/infra).

rust-highfive added a commit to rust-lang-nursery/rust-toolstate that referenced this pull request Aug 7, 2018
Tested on commit rust-lang/rust@45a9d41.
Direct link to PR: <rust-lang/rust#53016>

💔 clippy-driver on windows: test-fail → build-fail (cc @Manishearth @llogiq @mcarton @oli-obk, @rust-lang/infra).
💔 clippy-driver on linux: test-fail → build-fail (cc @Manishearth @llogiq @mcarton @oli-obk, @rust-lang/infra).
scottmcm added a commit to scottmcm/rust-clippy that referenced this pull request Aug 7, 2018
In-band lifetimes are no longer in the edition, so update the one place that was using them.
@scottmcm scottmcm deleted the impl-header-lifetime-elision branch August 7, 2018 07:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in 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