cleanup

Cargo.toml

@@ -69,7 +69,7 @@ half = { workspace = true, features = ["std"] }
 num-traits = { workspace = true, features = ["std"] }
 paste.workspace = true
 dry.workspace = true
-derive_more = { workspace = true, features = ["unwrap", "deref", "deref_mut"] }
+derive_more = { workspace = true, features = ["deref", "deref_mut"] }
 thiserror.workspace = true
 parking_lot = "0.12.1"
 bytemuck.workspace = true

src/buffer.rs

@@ -128,14 +128,6 @@ impl RawSlice {
             RawSliceInner::Device(buffer) => buffer.device().into(),
         }
     }
-    /*#[cfg(feature = "device")]
-    fn offset(&self) -> usize {
-        match &self.inner {
-            RawSliceInner::Host(_) => 0,
-            #[cfg(feature = "device")]
-            RawSliceInner::Device(buffer) => buffer.offset(),
-        }
-    }*/
     fn len(&self) -> usize {
         match &self.inner {
             RawSliceInner::Host(raw) => raw.len,
@@ -191,7 +183,7 @@ impl RawSlice {
     }
 }
 
-#[derive(Clone, derive_more::Unwrap)]
+#[derive(Clone)]
 enum RawSliceInner {
     Host(RawHostSlice),
     #[cfg(feature = "device")]

src/device.rs

@@ -25,12 +25,12 @@ use std::{
 #[cfg(feature = "device")]
 use std::{ops::Range, sync::atomic::AtomicBool};
 
-#[cfg(all(not(target_arch = "wasm32"), feature = "device"))]
+#[cfg(all(not(target_family = "wasm"), feature = "device"))]
 mod vulkan_engine;
-#[cfg(all(not(target_arch = "wasm32"), feature = "device"))]
+#[cfg(all(not(target_family = "wasm"), feature = "device"))]
 use vulkan_engine::Engine;
 
-#[cfg(all(target_arch = "wasm32", feature = "device"))]
+#[cfg(all(target_family = "wasm", feature = "device"))]
 compile_error!("device feature not supported on wasm");
 
 /// Errors.
@@ -286,7 +286,7 @@ impl From<RawDevice> for Device {
     }
 }
 
-#[derive(Clone, Eq, PartialEq, derive_more::Unwrap)]
+#[derive(Clone, Eq, PartialEq)]
 pub(crate) enum DeviceInner {
     Host,
     #[cfg(feature = "device")]