Skip to content

Add functionality for gating feature flags on epochs ; rejigger epoch lints - #48801

Merged
bors merged 9 commits into
rust-lang:masterfrom
Manishearth:epoch-features
Mar 9, 2018
Merged

Add functionality for gating feature flags on epochs ; rejigger epoch lints#48801
bors merged 9 commits into
rust-lang:masterfrom
Manishearth:epoch-features

Conversation

@Manishearth

@ManishearthManishearth commented Mar 7, 2018

Copy link
Copy Markdown
Member

@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Mar 7, 2018
@CentrilCentril added the WG-epoch Working group: Epoch (2018) management label Mar 7, 2018
@Manishearth
Manishearthforce-pushed the epoch-features branch 3 times, most recently from 83f60ca to f249692CompareMarch 7, 2018 18:50
nikomatsakis
nikomatsakis requested changes Mar 8, 2018
View reviewed changes

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

Looks nice!

Comment threadsrc/libsyntax/feature_gate.rs Outdated

@nikomatsakisnikomatsakisMar 8, 2018

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.

Can we make a test?

@nikomatsakisnikomatsakisMar 8, 2018

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.

e.g., // compile-flags: -Zepoch=2018, and then use dyn Trait

@bors

bors commented Mar 8, 2018

Copy link
Copy Markdown
Collaborator

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

@nikomatsakisnikomatsakis 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-review Status: Awaiting review from the assignee but also interested parties. labels Mar 8, 2018
@Manishearth
Manishearthforce-pushed the epoch-features branch 2 times, most recently from 5baa8bb to fc5ad32CompareMarch 8, 2018 17:33
@Manishearth

Manishearth commented Mar 8, 2018

Copy link
Copy Markdown
MemberAuthor

Added test.

Oh, also, I'm going to make bare_trait_object and unreachable_pub not be epoch lints -- I'll keep epoch lints to be actual breaking changes like tyvar_rptr and the keywords, and these lints can go ungrouped for now (we can group them later if we wish?)

@Manishearth
Manishearthforce-pushed the epoch-features branch 2 times, most recently from 779c10c to 9272579CompareMarch 8, 2018 21:27
@ManishearthManishearth changed the title Add functionality for gating feature flags on epochsAdd functionality for gating feature flags on epochs ; rejigger epoch lintsMar 8, 2018
nikomatsakis
nikomatsakis approved these changes Mar 8, 2018
View reviewed changes
Comment threadsrc/test/run-pass/epoch-gate-feature.rs Outdated

@nikomatsakisnikomatsakisMar 8, 2018

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.

<3

@nikomatsakis

nikomatsakis commented Mar 8, 2018

Copy link
Copy Markdown
Contributor

@bors r+

@bors

bors commented Mar 8, 2018

Copy link
Copy Markdown
Collaborator

📌 Commit d9f0c16 has been approved by nikomatsakis

@borsbors 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 8, 2018
@bors

bors commented Mar 9, 2018

Copy link
Copy Markdown
Collaborator

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

@borsbors 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 9, 2018
@Manishearth

Manishearth commented Mar 9, 2018

Copy link
Copy Markdown
MemberAuthor

@bors r=nikomatsakis

@bors

bors commented Mar 9, 2018

Copy link
Copy Markdown
Collaborator

📌 Commit a08cfc4 has been approved by nikomatsakis

@borsbors 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 9, 2018
Manishearth added a commit to Manishearth/rust that referenced this pull request Mar 9, 2018
@Manishearth
Rollup merge ofrust-lang#48801- Manishearth:epoch-features, r=nikom…
68e7282
…atsakis
Add functionality for gating feature flags on epochs ; rejigger epoch lints
fixesrust-lang#48794
r? @nikomatsakis
@ManishearthManishearth mentioned this pull request Mar 9, 2018
Merged
bors added a commit that referenced this pull request Mar 9, 2018
@bors
Auto merge of#48860- Manishearth:rollup, r=Manishearth
2079a08
Rollup of 5 pull requests
- Successful merges: #48527, #48588, #48801, #48856, #48857
- Failed merges:
@bors
bors merged commit a08cfc4 into rust-lang:masterMar 9, 2018
@ManishearthManishearth mentioned this pull request Mar 27, 2018
Closed
@dtolnaydtolnay mentioned this pull request Jul 29, 2018
Closed
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@nikomatsakisnikomatsakisnikomatsakis approved these changes

Assignees

@nikomatsakisnikomatsakis

Labels

S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.WG-epochWorking group: Epoch (2018) management

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Make it possible to gate features on epochs

5 participants

@Manishearth@bors@nikomatsakis@Centril@rust-highfive