Skip to content

Stabilize static lifetime in statics - #39265

Merged
bors merged 1 commit into
rust-lang:masterfrom
est31:master
Feb 9, 2017
Merged

Stabilize static lifetime in statics#39265
bors merged 1 commit into
rust-lang:masterfrom
est31:master

Conversation

@est31

@est31est31 commented Jan 23, 2017•
edited
Loading

Copy link
Copy Markdown
Member

Stabilize the "static_in_const" feature. Blockers before this PR can be merged:

Closes#35897.

@nikomatsakis

nikomatsakis commented Jan 24, 2017

Copy link
Copy Markdown
Contributor

@est31 nice

@bors

bors commented Jan 27, 2017

Copy link
Copy Markdown
Collaborator

☔ The latest upstream changes (presumably #39282) made this pull request unmergeable. Please resolve the merge conflicts.

@est31

est31 commented Jan 27, 2017

Copy link
Copy Markdown
MemberAuthor

Rebased.

@bors

bors commented Jan 28, 2017

Copy link
Copy Markdown
Collaborator

☔ The latest upstream changes (presumably #39305) made this pull request unmergeable. Please resolve the merge conflicts.

@est31
est31force-pushed the master branch 2 times, most recently from 8ac8f0d to 35191d0CompareJanuary 28, 2017 09:22
@est31

est31 commented Jan 28, 2017•
edited
Loading

Copy link
Copy Markdown
MemberAuthor

Rebased on top of @eddyb 's PR. Its really great to see how the PR made this change much easier, so it must have been a good refactor!

@alexcrichton

alexcrichton commented Feb 4, 2017

Copy link
Copy Markdown
Member

ping @nrc, would be a neat feature for 1.17!

@est31

est31 commented Feb 5, 2017

Copy link
Copy Markdown
MemberAuthor

@alexcrichton its currently blocked by #37928

@bors

bors commented Feb 5, 2017

Copy link
Copy Markdown
Collaborator

☔ The latest upstream changes (presumably #39563) made this pull request unmergeable. Please resolve the merge conflicts.

@est31

est31 commented Feb 5, 2017

Copy link
Copy Markdown
MemberAuthor

Now that beta branched, I would like to ask for beta backport nomination, so that already 1.16 would have it stabilized.

@alexcrichtonalexcrichton added the beta-nominated Nominated for backporting to the compiler in the beta channel. label Feb 5, 2017
@steveklabnik

steveklabnik commented Feb 6, 2017 via email

Copy link
Copy Markdown
Contributor

@nrc

nrc commented Feb 7, 2017

Copy link
Copy Markdown
Member

@bors: r+

I would also recommend against backporting - I don't think we should reduce stabilisation time in general.

@bors

bors commented Feb 7, 2017

Copy link
Copy Markdown
Collaborator

📌 Commit 0361dcf has been approved by nrc

@bors

bors commented Feb 7, 2017

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 0361dcf with merge 443866e...

@bors

bors commented Feb 7, 2017

Copy link
Copy Markdown
Collaborator

💔 Test failed - status-travis

@alexcrichton

alexcrichton commented Feb 7, 2017

Copy link
Copy Markdown
Member

@bors: r=nrc

@bors

bors commented Feb 7, 2017

Copy link
Copy Markdown
Collaborator

📌 Commit 1c8cb8a has been approved by nrc

@steveklabnik

steveklabnik commented Feb 7, 2017

Copy link
Copy Markdown
Contributor

#37928 is not yet closed, how is this being merged?

@alexcrichton

alexcrichton commented Feb 7, 2017

Copy link
Copy Markdown
Member

@bors: r-

@est31
est31force-pushed the master branch 2 times, most recently from 85accdc to f8b6108CompareFebruary 8, 2017 11:33
@est31

est31 commented Feb 9, 2017

Copy link
Copy Markdown
MemberAuthor

The documentation PR got merged, this is ready to be r+ed!

@petrochenkov

petrochenkov commented Feb 9, 2017

Copy link
Copy Markdown
Contributor

It took 2.5 months to document this (#37928 was open at Nov 22, 2016).
Fantastic.

@bors r+

@bors

bors commented Feb 9, 2017

Copy link
Copy Markdown
Collaborator

📌 Commit f8b6108 has been approved by petrochenkov

@bors

bors commented Feb 9, 2017

Copy link
Copy Markdown
Collaborator

⌛ Testing commit f8b6108 with merge 1129ce5...

bors added a commit that referenced this pull request Feb 9, 2017
@bors
Auto merge of#39265- est31:master, r=petrochenkov
1129ce5
Stabilize static lifetime in statics
Stabilize the "static_in_const" feature. Blockers before this PR can be merged:
* [x] The [FCP with inclination to stabilize](#35897 (comment)) needs to be over. FCP lasts roughly three weeks, so will be over at Jan 25, aka this thursday.
* [x] Documentation needs to be added (#37928)
Closes#35897.
@bors

bors commented Feb 9, 2017

Copy link
Copy Markdown
Collaborator

☀️ Test successful - status-appveyor, status-travis
Approved by: petrochenkov
Pushing 1129ce5 to master...

@bors
bors merged commit f8b6108 into rust-lang:masterFeb 9, 2017
@eddybeddyb mentioned this pull request Feb 13, 2017
Closed
@alexcrichtonalexcrichton mentioned this pull request Feb 17, 2017
Closed
@alexcrichton

alexcrichton commented Feb 21, 2017

Copy link
Copy Markdown
Member

Removing beta nomination as sentiment seems to be to not backport (also see #35897)

@alexcrichtonalexcrichton removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Feb 21, 2017
@Object905Object905 mentioned this pull request Aug 1, 2017
Closed
6 tasks
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@nrcnrc

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

7 participants

@est31@nikomatsakis@bors@alexcrichton@steveklabnik@nrc@petrochenkov