From 1f465e96d33a2721da3c7d69d58fa3071d04c0a7 Mon Sep 17 00:00:00 2001
From: Joshua Simmons <josh@nega.tv>
Date: Sun, 9 Jul 2023 19:50:09 +0200
Subject: [PATCH] narcissus-core: Improve align_offset

---
 libs/narcissus-core/src/lib.rs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libs/narcissus-core/src/lib.rs b/libs/narcissus-core/src/lib.rs
index d001603..ebe0443 100644
--- a/libs/narcissus-core/src/lib.rs
+++ b/libs/narcissus-core/src/lib.rs
@@ -293,7 +293,8 @@ pub trait Upcast<T: ?Sized> {
 #[must_use]
 pub fn align_offset(x: usize, align: usize) -> usize {
     debug_assert!(align.is_power_of_two());
-    (x + align - 1) & !(align - 1)
+    let align_mask = align - 1;
+    (x + align_mask) & !align_mask
 }
 
 #[must_use]
-- 
2.49.0