Skip to content

Commit

Permalink
Minor
Browse files Browse the repository at this point in the history
  • Loading branch information
wenyuzhao committed May 23, 2024
1 parent d1799a8 commit 7c4db9f
Showing 1 changed file with 10 additions and 10 deletions.
20 changes: 10 additions & 10 deletions mallockit/src/util/malloc/rust_alloc.rs
Original file line number Diff line number Diff line change
Expand Up @@ -20,29 +20,29 @@ macro_rules! export_rust_global_alloc_api {
fn allocate(
&self,
mut layout: ::std::alloc::Layout,
) -> Result<::std::ptr::NonNull<[u8]>, ::std::alloc::AllocError> {
) -> ::std::result::Result<::std::ptr::NonNull<[u8]>, ::std::alloc::AllocError> {
layout = Self::__fix_layout(layout);
let start = <$plan_ty as $crate::Plan>::Mutator::current()
.alloc(layout)
.unwrap_or($crate::util::Address::ZERO);
let slice = unsafe {
::std::slice::from_raw_parts_mut(start.as_mut() as *mut u8, layout.size())
};
Ok(::std::ptr::NonNull::from(slice))
::std::result::Result::Ok(::std::ptr::NonNull::from(slice))
}

fn allocate_zeroed(
&self,
mut layout: ::std::alloc::Layout,
) -> Result<::std::ptr::NonNull<[u8]>, ::std::alloc::AllocError> {
) -> ::std::result::Result<::std::ptr::NonNull<[u8]>, ::std::alloc::AllocError> {
layout = Self::__fix_layout(layout);
let start = <$plan_ty as $crate::Plan>::Mutator::current()
.alloc_zeroed(layout)
.unwrap_or($crate::util::Address::ZERO);
let slice = unsafe {
::std::slice::from_raw_parts_mut(start.as_mut() as *mut u8, layout.size())
};
Ok(::std::ptr::NonNull::from(slice))
::std::result::Result::Ok(::std::ptr::NonNull::from(slice))
}

unsafe fn deallocate(
Expand All @@ -58,7 +58,7 @@ macro_rules! export_rust_global_alloc_api {
ptr: ::std::ptr::NonNull<u8>,
old_layout: ::std::alloc::Layout,
mut new_layout: ::std::alloc::Layout,
) -> Result<::std::ptr::NonNull<[u8]>, ::std::alloc::AllocError> {
) -> ::std::result::Result<::std::ptr::NonNull<[u8]>, ::std::alloc::AllocError> {
debug_assert!(
new_layout.size() >= old_layout.size(),
"`new_layout.size()` must be greater than or equal to `old_layout.size()`"
Expand All @@ -71,15 +71,15 @@ macro_rules! export_rust_global_alloc_api {
let slice = unsafe {
::std::slice::from_raw_parts_mut(start.as_mut() as *mut u8, new_layout.size())
};
Ok(::std::ptr::NonNull::from(slice))
::std::result::Result::Ok(::std::ptr::NonNull::from(slice))
}

unsafe fn grow_zeroed(
&self,
ptr: ::std::ptr::NonNull<u8>,
old_layout: ::std::alloc::Layout,
mut new_layout: ::std::alloc::Layout,
) -> Result<::std::ptr::NonNull<[u8]>, ::std::alloc::AllocError> {
) -> ::std::result::Result<::std::ptr::NonNull<[u8]>, ::std::alloc::AllocError> {
debug_assert!(
new_layout.size() >= old_layout.size(),
"`new_layout.size()` must be greater than or equal to `old_layout.size()`"
Expand All @@ -92,15 +92,15 @@ macro_rules! export_rust_global_alloc_api {
let slice = unsafe {
::std::slice::from_raw_parts_mut(start.as_mut() as *mut u8, new_layout.size())
};
Ok(::std::ptr::NonNull::from(slice))
::std::result::Result::Ok(::std::ptr::NonNull::from(slice))
}

unsafe fn shrink(
&self,
ptr: ::std::ptr::NonNull<u8>,
old_layout: ::std::alloc::Layout,
mut new_layout: ::std::alloc::Layout,
) -> Result<::std::ptr::NonNull<[u8]>, ::std::alloc::AllocError> {
) -> ::std::result::Result<::std::ptr::NonNull<[u8]>, ::std::alloc::AllocError> {
debug_assert!(
new_layout.size() <= old_layout.size(),
"`new_layout.size()` must be smaller than or equal to `old_layout.size()`"
Expand All @@ -113,7 +113,7 @@ macro_rules! export_rust_global_alloc_api {
let slice = unsafe {
::std::slice::from_raw_parts_mut(start.as_mut() as *mut u8, new_layout.size())
};
Ok(::std::ptr::NonNull::from(slice))
::std::result::Result::Ok(::std::ptr::NonNull::from(slice))
}
}

Expand Down

0 comments on commit 7c4db9f

Please sign in to comment.