diff options
| author | bors <bors@rust-lang.org> | 2017-01-27 12:23:23 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-01-27 12:23:23 +0000 |
| commit | 463affee6b74aabf19b27b6040a20a3c95709cc5 (patch) | |
| tree | 897512b623d3a3e02e15a5df667a13f7278161ee /src/libsyntax | |
| parent | 8367fb7ba6abae89ab7e17c1b3987ee321f5bb71 (diff) | |
| parent | 5056a43752a34ec633fb71ff395f518bfc7ce52c (diff) | |
| download | rust-463affee6b74aabf19b27b6040a20a3c95709cc5.tar.gz rust-463affee6b74aabf19b27b6040a20a3c95709cc5.zip | |
Auto merge of #39282 - petrochenkov:selfstab, r=nikomatsakis
Stabilize Self and associated types in struct expressions and patterns Rebase of https://github.com/rust-lang/rust/pull/37734 Closes https://github.com/rust-lang/rust/issues/37544 r? @nikomatsakis
Diffstat (limited to 'src/libsyntax')
| -rw-r--r-- | src/libsyntax/feature_gate.rs | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/libsyntax/feature_gate.rs b/src/libsyntax/feature_gate.rs index d4448da932e..112211851ec 100644 --- a/src/libsyntax/feature_gate.rs +++ b/src/libsyntax/feature_gate.rs @@ -297,10 +297,6 @@ declare_features! ( // The #![windows_subsystem] attribute (active, windows_subsystem, "1.14.0", Some(37499)), - // Allows using `Self` and associated types in struct expressions and patterns. - (active, more_struct_aliases, "1.14.0", Some(37544)), - - // Allows #[link(..., cfg(..))] (active, link_cfg, "1.14.0", Some(37406)), @@ -381,6 +377,8 @@ declare_features! ( // Allows `..` in tuple (struct) patterns (accepted, dotdot_in_tuple_patterns, "1.14.0", Some(33627)), (accepted, item_like_imports, "1.14.0", Some(35120)), + // Allows using `Self` and associated types in struct expressions and patterns. + (accepted, more_struct_aliases, "1.14.0", Some(37544)), ); // (changing above list without updating src/doc/reference.md makes @cmr sad) |