diff options
| author | LeSeulArtichaut <leseulartichaut@gmail.com> | 2020-05-31 15:06:51 +0200 |
|---|---|---|
| committer | LeSeulArtichaut <leseulartichaut@gmail.com> | 2020-06-19 13:47:04 +0200 |
| commit | 7b6398657c2335c053d7733f5bb752e8d2b5d261 (patch) | |
| tree | 85034c79369bbcdbaef1726c204f8f66a8cef51f /src/liballoc | |
| parent | 39e29ce4d08674734e2f2759607b1486db7d0fde (diff) | |
| download | rust-7b6398657c2335c053d7733f5bb752e8d2b5d261.tar.gz rust-7b6398657c2335c053d7733f5bb752e8d2b5d261.zip | |
Apply suggestions from code review
Co-authored-by: nikomatsakis <niko@alum.mit.edu>
Diffstat (limited to 'src/liballoc')
| -rw-r--r-- | src/liballoc/alloc.rs | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/src/liballoc/alloc.rs b/src/liballoc/alloc.rs index 5bed68151dd..98c7ac3f2ef 100644 --- a/src/liballoc/alloc.rs +++ b/src/liballoc/alloc.rs @@ -215,14 +215,16 @@ unsafe impl AllocRef for Global { } ReallocPlacement::MayMove => { // `realloc` probably checks for `new_size > size` or something similar. - unsafe { + let ptr = unsafe { intrinsics::assume(new_size > size); - let ptr = realloc(ptr.as_ptr(), layout, new_size); - let memory = - MemoryBlock { ptr: NonNull::new(ptr).ok_or(AllocErr)?, size: new_size }; + realloc(ptr.as_ptr(), layout, new_size) + }; + let memory = + MemoryBlock { ptr: NonNull::new(ptr).ok_or(AllocErr)?, size: new_size }; + unsafe { init.init_offset(memory, size); - Ok(memory) } + Ok(memory) } } } @@ -255,11 +257,11 @@ unsafe impl AllocRef for Global { } ReallocPlacement::MayMove => { // `realloc` probably checks for `new_size < size` or something similar. - unsafe { + let ptr = unsafe { intrinsics::assume(new_size < size); - let ptr = realloc(ptr.as_ptr(), layout, new_size); - Ok(MemoryBlock { ptr: NonNull::new(ptr).ok_or(AllocErr)?, size: new_size }) - } + realloc(ptr.as_ptr(), layout, new_size) + }; + Ok(MemoryBlock { ptr: NonNull::new(ptr).ok_or(AllocErr)?, size: new_size }) } } } |
