diff options
Diffstat (limited to 'src/libsyntax')
| -rw-r--r-- | src/libsyntax/feature_gate.rs | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/libsyntax/feature_gate.rs b/src/libsyntax/feature_gate.rs index 5f0cf49cd96..1535e649506 100644 --- a/src/libsyntax/feature_gate.rs +++ b/src/libsyntax/feature_gate.rs @@ -357,8 +357,6 @@ declare_features! ( // Trait aliases (active, trait_alias, "1.24.0", Some(41517), None), - // global allocators and their internals - (active, global_allocator, "1.20.0", Some(27389), None), // rustc internal (active, allocator_internals, "1.20.0", None, None), @@ -615,6 +613,8 @@ declare_features! ( (accepted, macro_lifetime_matcher, "1.27.0", Some(34303), None), // Termination trait in tests (RFC 1937) (accepted, termination_trait_test, "1.27.0", Some(48854), None), + // The #[global_allocator] attribute + (accepted, global_allocator, "1.28.0", Some(27389), None), ); // If you change this, please modify src/doc/unstable-book as well. You must @@ -776,11 +776,7 @@ pub const BUILTIN_ATTRIBUTES: &'static [(&'static str, AttributeType, AttributeG "the `#[rustc_const_unstable]` attribute \ is an internal feature", cfg_fn!(rustc_const_unstable))), - ("global_allocator", Normal, Gated(Stability::Unstable, - "global_allocator", - "the `#[global_allocator]` attribute is \ - an experimental feature", - cfg_fn!(global_allocator))), + ("global_allocator", Normal, Ungated), ("default_lib_allocator", Whitelisted, Gated(Stability::Unstable, "allocator_internals", "the `#[default_lib_allocator]` \ |