diff options
| author | Josh Stone <jistone@redhat.com> | 2018-09-26 14:26:46 -0700 |
|---|---|---|
| committer | Josh Stone <jistone@redhat.com> | 2018-09-27 20:52:53 -0700 |
| commit | ce034951fb907c8aa6abd5e6e04769e5e628953c (patch) | |
| tree | 94468d8a5108315f82993dd95328270aefd3e2ec /src/libstd/alloc.rs | |
| parent | 7d52cbce6db83e4fc2d8706b4e4b9c7da76cbcf8 (diff) | |
| download | rust-ce034951fb907c8aa6abd5e6e04769e5e628953c.tar.gz rust-ce034951fb907c8aa6abd5e6e04769e5e628953c.zip | |
Bump to 1.31.0 and bootstrap from 1.30 beta
Diffstat (limited to 'src/libstd/alloc.rs')
| -rw-r--r-- | src/libstd/alloc.rs | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/libstd/alloc.rs b/src/libstd/alloc.rs index 6753ed4a3df..31fc9ed3f77 100644 --- a/src/libstd/alloc.rs +++ b/src/libstd/alloc.rs @@ -151,14 +151,12 @@ pub mod __default_lib_allocator { // ABI #[rustc_std_internal_symbol] - #[cfg_attr(stage0, no_mangle)] pub unsafe extern fn __rdl_alloc(size: usize, align: usize) -> *mut u8 { let layout = Layout::from_size_align_unchecked(size, align); System.alloc(layout) } #[rustc_std_internal_symbol] - #[cfg_attr(stage0, no_mangle)] pub unsafe extern fn __rdl_dealloc(ptr: *mut u8, size: usize, align: usize) { @@ -166,7 +164,6 @@ pub mod __default_lib_allocator { } #[rustc_std_internal_symbol] - #[cfg_attr(stage0, no_mangle)] pub unsafe extern fn __rdl_realloc(ptr: *mut u8, old_size: usize, align: usize, @@ -176,7 +173,6 @@ pub mod __default_lib_allocator { } #[rustc_std_internal_symbol] - #[cfg_attr(stage0, no_mangle)] pub unsafe extern fn __rdl_alloc_zeroed(size: usize, align: usize) -> *mut u8 { let layout = Layout::from_size_align_unchecked(size, align); System.alloc_zeroed(layout) |