Skip to content
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

Cleanup 'active' declare_features! with uniform style + sorting. #60362

Merged
merged 1 commit into from
Apr 30, 2019

Conversation

Centril
Copy link
Contributor

@Centril Centril commented Apr 28, 2019

r? @oli-obk

(added the FIXME you wanted)
cc #60354
cc #60361

src/tools/tidy/src/features.rs Show resolved Hide resolved
src/libsyntax/feature_gate.rs Show resolved Hide resolved

// Allows default type parameters to influence type inference.
(active, default_type_parameter_fallback, "1.3.0", Some(27336), None),
// FIXME: Document these and merge with the list below.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why did you move this list?

Copy link
Contributor Author

@Centril Centril Apr 29, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It didn't fit with the other groupings which are sorted lists so I moved here temporarily and hopefully @gnzlbg can help me reintegrate it later.

src/libsyntax/feature_gate.rs Outdated Show resolved Hide resolved
src/libsyntax/feature_gate.rs Outdated Show resolved Hide resolved
// Allows using the `may_dangle` attribute (RFC 1327).
(active, dropck_eyepatch, "1.10.0", Some(34761), None),

// Allows the use of custom attributes (RFC 572).
(active, custom_attribute, "1.0.0", Some(29642), None),
// Allows using `#[structural_match]` which indicates that a type is structurally matchable.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
// Allows using `#[structural_match]` which indicates that a type is structurally matchable.
// Allows using `#[structural_match]` which indicates that constants of that type
// may be used in patterns

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I believe #[structural_match] does / will do more than this; See: https://github.com/rust-lang/rfcs/blob/master/text/2000-const-generics.md#structural-equality wherein #[structural_match] is required for const generics; cc @varkor cc #60286

@Centril Centril force-pushed the cleanup-declare-features-active branch from 71faa9f to 3c00dfd Compare April 30, 2019 01:23
@oli-obk
Copy link
Contributor

oli-obk commented Apr 30, 2019

@bors r+

@bors
Copy link
Contributor

bors commented Apr 30, 2019

📌 Commit 3c00dfd has been approved by oli-obk

@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 Apr 30, 2019
Centril added a commit to Centril/rust that referenced this pull request Apr 30, 2019
…cepted, r=oli-obk

Cleanup declare_features! for 'accepted' with a uniform style + sort them

r? @oli-obk

cc rust-lang#60362
cc rust-lang#60361
Centril added a commit to Centril/rust that referenced this pull request Apr 30, 2019
…tive, r=oli-obk

Cleanup 'active' declare_features! with uniform style + sorting.

r? @oli-obk

(added the FIXME you wanted)
cc rust-lang#60354
cc rust-lang#60361
Centril added a commit to Centril/rust that referenced this pull request Apr 30, 2019
…cepted, r=oli-obk

Cleanup declare_features! for 'accepted' with a uniform style + sort them

r? @oli-obk

cc rust-lang#60362
cc rust-lang#60361
Centril added a commit to Centril/rust that referenced this pull request Apr 30, 2019
…tive, r=oli-obk

Cleanup 'active' declare_features! with uniform style + sorting.

r? @oli-obk

(added the FIXME you wanted)
cc rust-lang#60354
cc rust-lang#60361
Centril added a commit to Centril/rust that referenced this pull request Apr 30, 2019
…cepted, r=oli-obk

Cleanup declare_features! for 'accepted' with a uniform style + sort them

r? @oli-obk

cc rust-lang#60362
cc rust-lang#60361
Centril added a commit to Centril/rust that referenced this pull request Apr 30, 2019
…tive, r=oli-obk

Cleanup 'active' declare_features! with uniform style + sorting.

r? @oli-obk

(added the FIXME you wanted)
cc rust-lang#60354
cc rust-lang#60361
Centril added a commit to Centril/rust that referenced this pull request Apr 30, 2019
…cepted, r=oli-obk

Cleanup declare_features! for 'accepted' with a uniform style + sort them

r? @oli-obk

cc rust-lang#60362
cc rust-lang#60361
Centril added a commit to Centril/rust that referenced this pull request Apr 30, 2019
…tive, r=oli-obk

Cleanup 'active' declare_features! with uniform style + sorting.

r? @oli-obk

(added the FIXME you wanted)
cc rust-lang#60354
cc rust-lang#60361
bors added a commit that referenced this pull request Apr 30, 2019
Rollup of 7 pull requests

Successful merges:

 - #60344 (Don't try to render auto-trait bounds with any inference variables)
 - #60354 (Cleanup declare_features! for 'accepted' with a uniform style + sort them)
 - #60362 (Cleanup 'active' declare_features! with uniform style + sorting.)
 - #60382 (Revert "Update Source Code Pro fonts to version 2.030")
 - #60399 (Update clippy)
 - #60400 (Remove functions to simplify handling of feature(bind_by_move_pattern_guards))
 - #60408 (Add missing f16c_target_feature check to typeck collect)

Failed merges:

r? @ghost
@bors bors merged commit 3c00dfd into rust-lang:master Apr 30, 2019
@Centril Centril deleted the cleanup-declare-features-active branch April 30, 2019 18:10
kennytm added a commit to kennytm/rust that referenced this pull request May 2, 2019
… r=Centril

Tidy: ensure lang features are sorted by since

This is the tidy side of rust-lang#60361.

What is left is actually splitting features into groups and sorting by since.

This PR also likely to produce a small (a couple of lines) merge conflict with rust-lang#60362.

r? @Centril
Centril added a commit to Centril/rust that referenced this pull request May 2, 2019
… r=Centril

Tidy: ensure lang features are sorted by since

This is the tidy side of rust-lang#60361.

What is left is actually splitting features into groups and sorting by since.

This PR also likely to produce a small (a couple of lines) merge conflict with rust-lang#60362.

r? @Centril
Centril added a commit to Centril/rust that referenced this pull request May 3, 2019
… r=Centril

Tidy: ensure lang features are sorted by since

This is the tidy side of rust-lang#60361.

What is left is actually splitting features into groups and sorting by since.

This PR also likely to produce a small (a couple of lines) merge conflict with rust-lang#60362.

r? @Centril
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.

4 participants