Skip to content

Commit 2e6c99f

Browse files
committed
---
yaml --- r: 151547 b: refs/heads/try2 c: f3de28a h: refs/heads/master i: 151545: 3d03c15 151543: c962146 v: v3
1 parent ede6d28 commit 2e6c99f

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
55
refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
8-
refs/heads/try2: 034f2180616c301934c3971cac6832aa607a4f08
8+
refs/heads/try2: f3de28a920b9a9f2b9418b305dfeb30995d2c6d4
99
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
1010
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1111
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/libstd/rt/heap.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -179,26 +179,26 @@ unsafe fn closure_exchange_malloc(drop_glue: fn(*mut u8), size: uint, align: uin
179179
#[doc(hidden)]
180180
#[deprecated]
181181
#[cfg(stage0, not(test))]
182-
pub extern "C" fn rust_malloc(size: uint) -> *mut u8 {
183-
unsafe { exchange_malloc(size) }
182+
pub unsafe extern "C" fn rust_malloc(size: uint) -> *mut u8 {
183+
exchange_malloc(size)
184184
}
185185

186186
// hack for libcore
187187
#[no_mangle]
188188
#[doc(hidden)]
189189
#[deprecated]
190190
#[cfg(not(stage0), not(test))]
191-
pub extern "C" fn rust_malloc(size: uint, align: uint) -> *mut u8 {
192-
unsafe { exchange_malloc(size, align) }
191+
pub unsafe extern "C" fn rust_malloc(size: uint, align: uint) -> *mut u8 {
192+
exchange_malloc(size, align)
193193
}
194194

195195
// hack for libcore
196196
#[no_mangle]
197197
#[doc(hidden)]
198198
#[deprecated]
199199
#[cfg(not(test))]
200-
pub extern "C" fn rust_free(ptr: *mut u8, size: uint, align: uint) {
201-
unsafe { exchange_free(ptr, size, align) }
200+
pub unsafe extern "C" fn rust_free(ptr: *mut u8, size: uint, align: uint) {
201+
exchange_free(ptr, size, align)
202202
}
203203

204204
#[cfg(test)]

0 commit comments

Comments
 (0)