diff options
| author | bors <bors@rust-lang.org> | 2017-04-05 16:47:45 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-04-05 16:47:45 +0000 |
| commit | 46f71a03f9b7bad2fa469113e3858ea2bdbbb5e5 (patch) | |
| tree | f1781c8eee2c19a80fc40159ebe7c9de37817f31 /src/libsyntax | |
| parent | ad5dfecc6ae23bb7d2b8075d705011918ab4f399 (diff) | |
| parent | 97a1f4b1f4e2acc25f939ea08ff634f70e1ab58d (diff) | |
| download | rust-46f71a03f9b7bad2fa469113e3858ea2bdbbb5e5.tar.gz rust-46f71a03f9b7bad2fa469113e3858ea2bdbbb5e5.zip | |
Auto merge of #41086 - frewsxcv:rollup, r=frewsxcv
Rollup of 19 pull requests - Successful merges: #40608, #40870, #40949, #40977, #40981, #40988, #40992, #40997, #40999, #41007, #41014, #41019, #41035, #41043, #41049, #41062, #41066, #41076, #41085 - Failed merges:
Diffstat (limited to 'src/libsyntax')
| -rw-r--r-- | src/libsyntax/feature_gate.rs | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/src/libsyntax/feature_gate.rs b/src/libsyntax/feature_gate.rs index 12d25ca4274..412803ddcd5 100644 --- a/src/libsyntax/feature_gate.rs +++ b/src/libsyntax/feature_gate.rs @@ -292,9 +292,6 @@ declare_features! ( // Allows attributes on lifetime/type formal parameters in generics (RFC 1327) (active, generic_param_attrs, "1.11.0", Some(34761)), - // The #![windows_subsystem] attribute - (active, windows_subsystem, "1.14.0", Some(37499)), - // Allows #[link(..., cfg(..))] (active, link_cfg, "1.14.0", Some(37406)), @@ -408,7 +405,8 @@ declare_features! ( (accepted, static_recursion, "1.17.0", Some(29719)), // pub(restricted) visibilities (RFC 1422) (accepted, pub_restricted, "1.17.0", Some(32409)), - + // The #![windows_subsystem] attribute + (accepted, windows_subsystem, "1.18.0", Some(37499)), ); // If you change this, please modify src/doc/unstable-book as well. You must // move that documentation into the relevant place in the other docs, and @@ -768,11 +766,7 @@ pub const BUILTIN_ATTRIBUTES: &'static [(&'static str, AttributeType, AttributeG "unboxed_closures are still evolving", cfg_fn!(unboxed_closures))), - ("windows_subsystem", Whitelisted, Gated(Stability::Unstable, - "windows_subsystem", - "the windows subsystem attribute \ - is currently unstable", - cfg_fn!(windows_subsystem))), + ("windows_subsystem", Whitelisted, Ungated), ("proc_macro_attribute", Normal, Gated(Stability::Unstable, "proc_macro", |