Calculate layout in const context

crossbeam-rs · Dec 15, 2024 · 54988eb · 54988eb
1 parent 761d0b6
commit 54988eb
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 12 deletions.
diff --git a/crossbeam-channel/src/flavors/list.rs b/crossbeam-channel/src/flavors/list.rs
@@ -72,18 +72,22 @@ struct Block<T> {
 }
 
 impl<T> Block<T> {
-    /// Creates an empty block.
-    fn new() -> Box<Self> {
+    const LAYOUT: Layout = {
         let layout = Layout::new::<Self>();
         assert!(
             layout.size() != 0,
             "Block should never be zero-sized, as it has an AtomicPtr field"
         );
+        layout
+    };
+
+    /// Creates an empty block.
+    fn new() -> Box<Self> {
         // SAFETY: layout is not zero-sized
-        let ptr = unsafe { alloc_zeroed(layout) };
+        let ptr = unsafe { alloc_zeroed(Self::LAYOUT) };
         // Handle allocation failure
         if ptr.is_null() {
-            handle_alloc_error(layout)
+            handle_alloc_error(Self::LAYOUT)
         }
         // SAFETY: This is safe because:
         //  [1] `Block::next` (AtomicPtr) may be safely zero initialized.

diff --git a/crossbeam-deque/src/deque.rs b/crossbeam-deque/src/deque.rs
@@ -1225,18 +1225,22 @@ struct Block<T> {
 }
 
 impl<T> Block<T> {
-    /// Creates an empty block.
-    fn new() -> Box<Self> {
+    const LAYOUT: Layout = {
         let layout = Layout::new::<Self>();
         assert!(
             layout.size() != 0,
             "Block should never be zero-sized, as it has an AtomicPtr field"
         );
+        layout
+    };
+
+    /// Creates an empty block.
+    fn new() -> Box<Self> {
         // SAFETY: layout is not zero-sized
-        let ptr = unsafe { alloc_zeroed(layout) };
+        let ptr = unsafe { alloc_zeroed(Self::LAYOUT) };
         // Handle allocation failure
         if ptr.is_null() {
-            handle_alloc_error(layout)
+            handle_alloc_error(Self::LAYOUT)
         }
         // SAFETY: This is safe because:
         //  [1] `Block::next` (AtomicPtr) may be safely zero initialized.

diff --git a/crossbeam-queue/src/seg_queue.rs b/crossbeam-queue/src/seg_queue.rs
@@ -58,18 +58,22 @@ struct Block<T> {
 }
 
 impl<T> Block<T> {
-    /// Creates an empty block.
-    fn new() -> Box<Self> {
+    const LAYOUT: Layout = {
         let layout = Layout::new::<Self>();
         assert!(
             layout.size() != 0,
             "Block should never be zero-sized, as it has an AtomicPtr field"
         );
+        layout
+    };
+
+    /// Creates an empty block.
+    fn new() -> Box<Self> {
         // SAFETY: layout is not zero-sized
-        let ptr = unsafe { alloc_zeroed(layout) };
+        let ptr = unsafe { alloc_zeroed(Self::LAYOUT) };
         // Handle allocation failure
         if ptr.is_null() {
-            handle_alloc_error(layout)
+            handle_alloc_error(Self::LAYOUT)
         }
         // SAFETY: This is safe because:
         //  [1] `Block::next` (AtomicPtr) may be safely zero initialized.