mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Apply suggestions from code review

Browse Source 
Co-authored-by: nikomatsakis <niko@alum.mit.edu>
This commit is contained in:
LeSeulArtichaut 2020-05-31 15:06:51 +02:00
parent 39e29ce4d0
commit 7b6398657c
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/liballoc/alloc.rs
View File

@ -215,14 +215,16 @@ unsafe fn grow(
}
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 fn shrink(
}
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 })
}
}
}