about summary refs log tree commit diff
path: root/src/liballoc
diff options
context:
space:
mode:
authorSimon Sapin <simon.sapin@exyr.org>2018-05-31 19:13:57 +0200
committerSimon Sapin <simon.sapin@exyr.org>2018-06-11 13:48:39 -0700
commit125b259b3567f6370d5c242eb102ca0957ffe017 (patch)
treeb7201c3824fcf40b9321d11fbf9ad1a95fd843f1 /src/liballoc
parent45d6d207b00cb1353d0f66d4319f2bdcf1fbc892 (diff)
downloadrust-125b259b3567f6370d5c242eb102ca0957ffe017.tar.gz
rust-125b259b3567f6370d5c242eb102ca0957ffe017.zip
Stabilize alloc::oom (but not set_oom_hook or take_oom_hook)
Diffstat (limited to 'src/liballoc')
-rw-r--r--src/liballoc/alloc.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/liballoc/alloc.rs b/src/liballoc/alloc.rs
index 839b1bf99be..fef668d2365 100644
--- a/src/liballoc/alloc.rs
+++ b/src/liballoc/alloc.rs
@@ -186,7 +186,7 @@ pub(crate) unsafe fn box_free<T: ?Sized>(ptr: Unique<T>) {
 /// and abort the process.
 /// It can be replaced with [`std::alloc::set_oom_hook`]
 /// and [`std::alloc::take_oom_hook`].
-#[unstable(feature = "allocator_api", issue = "32838")]
+#[stable(feature = "global_alloc", since = "1.28.0")]
 #[rustc_allocator_nounwind]
 pub fn oom(layout: Layout) -> ! {
     #[allow(improper_ctypes)]