dep: remove sptr due to msrv bump

SnowflakePowered · Oct 6, 2024 · ad04f5f · ad04f5f
1 parent ed8bf63
commit ad04f5f
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 19 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/librashader-capi/Cargo.toml b/librashader-capi/Cargo.toml
@@ -40,8 +40,6 @@ thiserror = "1.0.37"
 paste = "1.0.9"
 rustc-hash = "2.0.0"
 
-sptr = "0.3.2"
-
 glow = { workspace = true, optional = true }
 ash = { workspace = true, optional = true }
 cc = "=1.1.23"

diff --git a/librashader-capi/src/error.rs b/librashader-capi/src/error.rs
@@ -271,12 +271,12 @@ impl LibrashaderError {
 
 macro_rules! assert_non_null {
     (@EXPORT $value:ident) => {
-        if $value.is_null() || !$crate::ffi::ptr_is_aligned($value) {
+        if $value.is_null() || !$value.is_aligned() {
             return $crate::error::LibrashaderError::InvalidParameter(stringify!($value)).export();
         }
     };
     ($value:ident) => {
-        if $value.is_null() || !$crate::ffi::ptr_is_aligned($value) {
+        if $value.is_null() || !$value.is_aligned() {
             return Err($crate::error::LibrashaderError::InvalidParameter(
                 stringify!($value),
             ));

diff --git a/librashader-capi/src/ffi.rs b/librashader-capi/src/ffi.rs
@@ -237,14 +237,6 @@ pub unsafe fn boxed_slice_from_raw_parts<T>(ptr: *mut T, len: usize) -> Box<[T]>
     unsafe { Box::from_raw(std::slice::from_raw_parts_mut(ptr, len)) }
 }
 
-pub fn ptr_is_aligned<T: Sized>(ptr: *const T) -> bool {
-    let align = std::mem::align_of::<T>();
-    if !align.is_power_of_two() {
-        panic!("is_aligned_to: align is not a power-of-two");
-    }
-    sptr::Strict::addr(ptr) & (align - 1) == 0
-}
-
 pub(crate) use extern_fn;
 pub(crate) use ffi_body;
 pub(crate) use wrap_ok;