diff options
| author | Simon Sapin <simon.sapin@exyr.org> | 2018-05-31 19:16:24 +0200 |
|---|---|---|
| committer | Simon Sapin <simon.sapin@exyr.org> | 2018-06-11 13:48:39 -0700 |
| commit | 8111717da1d5854495b001be49346985ac3f208d (patch) | |
| tree | bab29134c251ac0ba2aeaa45163f0cd773a80a4b /src | |
| parent | 90d19728fc93157465c1a586dbd35c6dc4cf78c9 (diff) | |
| download | rust-8111717da1d5854495b001be49346985ac3f208d.tar.gz rust-8111717da1d5854495b001be49346985ac3f208d.zip | |
Stabilize the `System` allocator
Diffstat (limited to 'src')
| -rw-r--r-- | src/liballoc_system/lib.rs | 8 | ||||
| -rw-r--r-- | src/libstd/alloc.rs | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/liballoc_system/lib.rs b/src/liballoc_system/lib.rs index 85bf43a5429..a592868cbef 100644 --- a/src/liballoc_system/lib.rs +++ b/src/liballoc_system/lib.rs @@ -45,7 +45,7 @@ use core::alloc::{Alloc, GlobalAlloc, AllocErr, Layout}; use core::ptr::NonNull; /// The default memory allocator provided by the operating system. -#[unstable(feature = "allocator_api", issue = "32838")] +#[stable(feature = "alloc_system_type", since = "1.28.0")] pub struct System; #[unstable(feature = "allocator_api", issue = "32838")] @@ -107,7 +107,7 @@ mod platform { use System; use core::alloc::{GlobalAlloc, Layout}; - #[unstable(feature = "allocator_api", issue = "32838")] + #[stable(feature = "alloc_system_type", since = "1.28.0")] unsafe impl GlobalAlloc for System { #[inline] unsafe fn alloc(&self, layout: Layout) -> *mut u8 { @@ -240,7 +240,7 @@ mod platform { ptr as *mut u8 } - #[unstable(feature = "allocator_api", issue = "32838")] + #[stable(feature = "alloc_system_type", since = "1.28.0")] unsafe impl GlobalAlloc for System { #[inline] unsafe fn alloc(&self, layout: Layout) -> *mut u8 { @@ -304,7 +304,7 @@ mod platform { // No need for synchronization here as wasm is currently single-threaded static mut DLMALLOC: dlmalloc::Dlmalloc = dlmalloc::DLMALLOC_INIT; - #[unstable(feature = "allocator_api", issue = "32838")] + #[stable(feature = "alloc_system_type", since = "1.28.0")] unsafe impl GlobalAlloc for System { #[inline] unsafe fn alloc(&self, layout: Layout) -> *mut u8 { diff --git a/src/libstd/alloc.rs b/src/libstd/alloc.rs index fd829bfe753..6cae8aaa3db 100644 --- a/src/libstd/alloc.rs +++ b/src/libstd/alloc.rs @@ -20,7 +20,7 @@ use sys_common::util::dumb_print; #[doc(inline)] pub use alloc_crate::alloc::*; -#[unstable(feature = "allocator_api", issue = "32838")] +#[stable(feature = "alloc_system_type", since = "1.28.0")] #[doc(inline)] pub use alloc_system::System; |