about summary refs log tree commit diff
path: root/src/libstd/alloc.rs
diff options
context:
space:
mode:
authorSimon Sapin <simon.sapin@exyr.org>2018-04-03 21:15:06 +0200
committerSimon Sapin <simon.sapin@exyr.org>2018-04-12 22:52:47 +0200
commite521b8b472dfe058f6d0f62f2e1ab5f291c220ee (patch)
treeb7bd74b0b572fc7143fd783a6e912b4d1ebbf1cc /src/libstd/alloc.rs
parent88ebd2d752831860d8824849cf6f5ae656a2c3eb (diff)
downloadrust-e521b8b472dfe058f6d0f62f2e1ab5f291c220ee.tar.gz
rust-e521b8b472dfe058f6d0f62f2e1ab5f291c220ee.zip
Actually deprecate the Heap type
Diffstat (limited to 'src/libstd/alloc.rs')
-rw-r--r--src/libstd/alloc.rs3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/libstd/alloc.rs b/src/libstd/alloc.rs
index 77be3e52d76..eb0c960732d 100644
--- a/src/libstd/alloc.rs
+++ b/src/libstd/alloc.rs
@@ -12,7 +12,8 @@
 
 #![unstable(issue = "32838", feature = "allocator_api")]
 
-#[doc(inline)] pub use alloc_crate::alloc::Heap;
+#[doc(inline)] #[allow(deprecated)] pub use alloc_crate::alloc::Heap;
+#[doc(inline)] pub use alloc_crate::alloc::Global;
 #[doc(inline)] pub use alloc_system::System;
 #[doc(inline)] pub use core::alloc::*;