diff --git a/wutil-rs/src/memory.rs b/wutil-rs/src/memory.rs index 8f06450a..b1def97b 100644 --- a/wutil-rs/src/memory.rs +++ b/wutil-rs/src/memory.rs @@ -49,18 +49,15 @@ pub fn alloc_bytes(size: usize) -> *mut u8 { if size == 0 { return ptr::null_mut(); } - let header_layout = match alloc::Layout::from_size_align(mem::size_of::
(), 8) { - Ok(x) => x, - Err(_) => return ptr::null_mut(), + let Ok(header_layout) = alloc::Layout::from_size_align(mem::size_of::
(), 8) else { + return ptr::null_mut(); }; - let layout = match alloc::Layout::from_size_align(size, 8) { - Ok(x) => x, - Err(_) => return ptr::null_mut(), + let Ok(layout) = alloc::Layout::from_size_align(size, 8) else { + return ptr::null_mut(); }; - let (layout, result_offset) = match header_layout.extend(layout) { - Ok(x) => x, - Err(_) => return ptr::null_mut(), + let Ok((full_layout, result_offset)) = header_layout.extend(layout) else { + return ptr::null_mut(); }; let full_segment = unsafe { alloc::alloc_zeroed(layout) };