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/liballoc_jemalloc | |
| 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/liballoc_jemalloc')
| -rw-r--r-- | src/liballoc_jemalloc/lib.rs | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/liballoc_jemalloc/lib.rs b/src/liballoc_jemalloc/lib.rs index bdf0e37a2e6..0065e84a7ad 100644 --- a/src/liballoc_jemalloc/lib.rs +++ b/src/liballoc_jemalloc/lib.rs @@ -16,7 +16,7 @@ #![feature(core_intrinsics)] #![feature(libc)] #![feature(linkage)] -#![cfg_attr(not(stage0), feature(nll))] +#![feature(nll)] #![feature(staged_api)] #![feature(rustc_attrs)] #![cfg_attr(dummy_jemalloc, allow(dead_code, unused_extern_crates))] @@ -90,7 +90,6 @@ mod contents { // ABI #[rustc_std_internal_symbol] - #[cfg_attr(stage0, no_mangle)] pub unsafe extern fn __rde_alloc(size: usize, align: usize) -> *mut u8 { let flags = align_to_flags(align, size); let ptr = mallocx(size as size_t, flags) as *mut u8; @@ -98,7 +97,6 @@ mod contents { } #[rustc_std_internal_symbol] - #[cfg_attr(stage0, no_mangle)] pub unsafe extern fn __rde_dealloc(ptr: *mut u8, size: usize, align: usize) { @@ -107,7 +105,6 @@ mod contents { } #[rustc_std_internal_symbol] - #[cfg_attr(stage0, no_mangle)] pub unsafe extern fn __rde_realloc(ptr: *mut u8, _old_size: usize, align: usize, @@ -118,7 +115,6 @@ mod contents { } #[rustc_std_internal_symbol] - #[cfg_attr(stage0, no_mangle)] pub unsafe extern fn __rde_alloc_zeroed(size: usize, align: usize) -> *mut u8 { let ptr = if align <= MIN_ALIGN && align <= size { calloc(size as size_t, 1) as *mut u8 |