diff options
| author | bors <bors@rust-lang.org> | 2018-09-30 01:45:50 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-09-30 01:45:50 +0000 |
| commit | 6310be458f4665f537419f033a764b0644c7e5ab (patch) | |
| tree | 89427e9623f634be3528a30ca9441475d83b7e58 /src/libstd/alloc.rs | |
| parent | e0a1ab6374340a4b9ca9f0c6d387763cf163526e (diff) | |
| parent | d40b6cf086734109ec402aa546eca4d3925732ca (diff) | |
| download | rust-6310be458f4665f537419f033a764b0644c7e5ab.tar.gz rust-6310be458f4665f537419f033a764b0644c7e5ab.zip | |
Auto merge of #54601 - cuviper:prep-1.31, r=Mark-Simulacrum
Bump to 1.31.0 and bootstrap from 1.30 beta Closes #54594.
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) |