diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2015-01-21 09:23:27 -0800 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2015-01-21 10:32:56 -0800 |
| commit | 4ffde0814f43076c944f46890e0b6d401de92ca4 (patch) | |
| tree | 4b1c7d0612d0901a4746724b103d61ef2a7cee0a /src/liballoc | |
| parent | 9c999c797c12f3f79482f0f4f416567b6bcc2a63 (diff) | |
| download | rust-4ffde0814f43076c944f46890e0b6d401de92ca4.tar.gz rust-4ffde0814f43076c944f46890e0b6d401de92ca4.zip | |
Test fixes and rebase conflicts
Diffstat (limited to 'src/liballoc')
| -rw-r--r-- | src/liballoc/heap.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/liballoc/heap.rs b/src/liballoc/heap.rs index 44be0503bc2..a2643f4d0f7 100644 --- a/src/liballoc/heap.rs +++ b/src/liballoc/heap.rs @@ -280,7 +280,7 @@ mod imp { if align <= MIN_ALIGN { libc::malloc(size as libc::size_t) as *mut u8 } else { - let mut out = ptr::null(); + let mut out = ptr::null_mut(); let ret = posix_memalign(&mut out, align as libc::size_t, size as libc::size_t); |