Skip to content

Commit 999690c

Browse files
committed
Stabilize the #[global_allocator] attribute
Fixes rust-lang#27389
1 parent 8111717 commit 999690c

File tree

3 files changed

+3
-32
lines changed

3 files changed

+3
-32
lines changed

src/libsyntax/feature_gate.rs

+3-7
Original file line numberDiff line numberDiff line change
@@ -357,8 +357,6 @@ declare_features! (
357357
// Trait aliases
358358
(active, trait_alias, "1.24.0", Some(41517), None),
359359

360-
// global allocators and their internals
361-
(active, global_allocator, "1.20.0", Some(27389), None),
362360
// rustc internal
363361
(active, allocator_internals, "1.20.0", None, None),
364362

@@ -615,6 +613,8 @@ declare_features! (
615613
(accepted, macro_lifetime_matcher, "1.27.0", Some(34303), None),
616614
// Termination trait in tests (RFC 1937)
617615
(accepted, termination_trait_test, "1.27.0", Some(48854), None),
616+
// The #[global_allocator] attribute
617+
(accepted, global_allocator, "1.28.0", Some(27389), None),
618618
);
619619

620620
// 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
776776
"the `#[rustc_const_unstable]` attribute \
777777
is an internal feature",
778778
cfg_fn!(rustc_const_unstable))),
779-
("global_allocator", Normal, Gated(Stability::Unstable,
780-
"global_allocator",
781-
"the `#[global_allocator]` attribute is \
782-
an experimental feature",
783-
cfg_fn!(global_allocator))),
779+
("global_allocator", Normal, Ungated),
784780
("default_lib_allocator", Whitelisted, Gated(Stability::Unstable,
785781
"allocator_internals",
786782
"the `#[default_lib_allocator]` \

src/test/ui/feature-gate-global_allocator.rs

-14
This file was deleted.

src/test/ui/feature-gate-global_allocator.stderr

-11
This file was deleted.

0 commit comments

Comments
 (0)