diff options
| author | bors <bors@rust-lang.org> | 2015-05-10 05:32:20 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-05-10 05:32:20 +0000 |
| commit | 750f2c63f2737305d33288303cdecb7a470a7922 (patch) | |
| tree | c4b7b0a038d5c0d9e83ac7ba40ad9332b5273b13 /src/liballoc | |
| parent | dc630d01e3eae8ba05db98383119bc2ddbbb01c1 (diff) | |
| parent | 2274bf126ae5aa9c3d010b5117118d61bda64972 (diff) | |
| download | rust-750f2c63f2737305d33288303cdecb7a470a7922.tar.gz rust-750f2c63f2737305d33288303cdecb7a470a7922.zip | |
Auto merge of #25262 - Manishearth:rollup, r=Manishearth
- Successful merges: #25200, #25242, #25248, #25249, #25251, #25252, #25261 - Failed merges: #25255
Diffstat (limited to 'src/liballoc')
| -rw-r--r-- | src/liballoc/heap.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/liballoc/heap.rs b/src/liballoc/heap.rs index 86a04a0687a..83795a24c81 100644 --- a/src/liballoc/heap.rs +++ b/src/liballoc/heap.rs @@ -95,7 +95,7 @@ pub const EMPTY: *mut () = 0x1 as *mut (); /// The allocator for unique pointers. #[cfg(not(test))] -#[lang="exchange_malloc"] +#[lang = "exchange_malloc"] #[inline] unsafe fn exchange_malloc(size: usize, align: usize) -> *mut u8 { if size == 0 { @@ -108,7 +108,7 @@ unsafe fn exchange_malloc(size: usize, align: usize) -> *mut u8 { } #[cfg(not(test))] -#[lang="exchange_free"] +#[lang = "exchange_free"] #[inline] unsafe fn exchange_free(ptr: *mut u8, old_size: usize, align: usize) { deallocate(ptr, old_size, align); |
