Improve readability of alloc_ptr helper function.

adamreichold · Oct 12, 2023 · 67e2e04 · 67e2e04
1 parent c34bddc
commit 67e2e04
Showing 1 changed file with 7 additions and 9 deletions.
diff --git a/src/archetype.rs b/src/archetype.rs
@@ -374,17 +374,15 @@ impl TypeMetadataSet {
 }
 
 fn alloc_ptr(layout: Layout) -> *mut u8 {
-    let ptr = if layout.size() != 0 {
-        unsafe { alloc(layout) }
-    } else {
-        invalid_ptr(layout.align())
-    };
-
-    if !ptr.is_null() {
-        ptr
-    } else {
+    if layout.size() == 0 {
+        return invalid_ptr(layout.align());
+    }
+
+    let ptr = unsafe { alloc(layout) };
+    if ptr.is_null() {
         handle_alloc_error(layout);
     }
+    ptr
 }
 
 fn invalid_ptr(addr: usize) -> *mut u8 {