diff --git a/src/experimental/coroutines/generational_storage.rs b/src/experimental/coroutines/generational_storage.rs index 9f2a2c11..eb2f4d24 100644 --- a/src/experimental/coroutines/generational_storage.rs +++ b/src/experimental/coroutines/generational_storage.rs @@ -125,6 +125,6 @@ impl GenerationalStorage { } pub(crate) fn allocated_memory(&self) -> usize { - self.vec.capacity() * std::mem::size_of::>() + self.vec.capacity() * size_of::>() } } diff --git a/src/experimental/scene.rs b/src/experimental/scene.rs index 85a50c39..63f1a367 100644 --- a/src/experimental/scene.rs +++ b/src/experimental/scene.rs @@ -300,13 +300,13 @@ impl Cell { virtual_drop: unsafe { std::mem::transmute(&(virtual_drop:: as fn(*mut ())) as *const fn(*mut ())) }, - data_len: std::mem::size_of::(), + data_len: size_of::(), initialized: false, } } fn update(&mut self, data: T) { - assert!(std::mem::size_of::() <= self.data_len); + assert!(size_of::() <= self.data_len); let trait_obj = &data as &dyn NodeAny; let (_, vtable) = unsafe { std::mem::transmute::<_, (*mut (), *mut ())>(trait_obj) }; @@ -446,7 +446,7 @@ impl Scene { if let Some(i) = self .free_nodes .iter() - .position(|free_node| free_node.data_len >= std::mem::size_of::()) + .position(|free_node| free_node.data_len >= size_of::()) { let mut free_node = self.free_nodes.remove(i); @@ -459,7 +459,7 @@ impl Scene { let trait_obj = &data as &dyn NodeAny; let (_, vtable) = unsafe { std::mem::transmute::<_, (*mut (), *mut ())>(trait_obj) }; - let ptr = self.arena.alloc(std::mem::size_of::()) as *mut _ as *mut T; + let ptr = self.arena.alloc(size_of::()) as *mut _ as *mut T; unsafe { std::ptr::write(ptr, data); } diff --git a/src/experimental/scene/arena.rs b/src/experimental/scene/arena.rs index b2c042ac..d93170fa 100644 --- a/src/experimental/scene/arena.rs +++ b/src/experimental/scene/arena.rs @@ -5,7 +5,6 @@ //! `Arena` is exported at the root of the crate. use std::cell::Cell; -use std::mem::size_of; const ARENA_BLOCK: usize = 64 * 1024; diff --git a/src/quad_gl.rs b/src/quad_gl.rs index 79c24beb..b4f9b22e 100644 --- a/src/quad_gl.rs +++ b/src/quad_gl.rs @@ -309,12 +309,12 @@ impl PipelineExt { let uniform_byte_size = uniform_format.size(); let uniform_byte_offset = uniform_meta.byte_offset; - if std::mem::size_of::() != uniform_byte_size { + if size_of::() != uniform_byte_size { warn!( "Trying to set uniform {} sized {} bytes value of {} bytes", name, uniform_byte_size, - std::mem::size_of::() + size_of::() ); return; } @@ -360,7 +360,7 @@ impl PipelineExt { "Trying to set uniform {} sized {} bytes value of {} bytes", name, uniform_byte_size, - std::mem::size_of::() + size_of::() ); return; } diff --git a/src/tobytes.rs b/src/tobytes.rs index 9f651c99..12fdb455 100644 --- a/src/tobytes.rs +++ b/src/tobytes.rs @@ -8,10 +8,7 @@ macro_rules! impl_tobytes { impl ToBytes for $t { fn to_bytes(&self) -> &[u8] { unsafe { - std::slice::from_raw_parts( - self as *const _ as *const u8, - std::mem::size_of::<$t>(), - ) + std::slice::from_raw_parts(self as *const _ as *const u8, size_of::<$t>()) } } } @@ -27,9 +24,7 @@ impl_tobytes!(Mat4); impl ToBytes for &[T; N] { fn to_bytes(&self) -> &[u8] { - unsafe { - std::slice::from_raw_parts(*self as *const _ as *const u8, std::mem::size_of::() * N) - } + unsafe { std::slice::from_raw_parts(*self as *const _ as *const u8, size_of::() * N) } } } @@ -38,7 +33,7 @@ impl ToBytes for &[T] { unsafe { std::slice::from_raw_parts( self.as_ptr() as *const _ as *const u8, - std::mem::size_of::() * self.len(), + size_of::() * self.len(), ) } }