Clean up BufferContents derive macro expansion further (#2588)

vulkano-macros/src/derive_buffer_contents.rs

@@ -165,16 +165,10 @@ pub fn derive_buffer_contents(crate_ident: &Ident, mut ast: DeriveInput) -> Resu
 
     let bounds = bound_types.into_iter().map(|ty| {
         quote_spanned! { ty.span() =>
-            const _: () = {
+            // HACK: This works around Rust issue #48214, which makes it impossible to put these
-                // HACK: This works around Rust issue #48214, which makes it impossible to put
+            // bounds in the where clause of the trait implementation where they actually belong
-                // these bounds in the where clause of the trait implementation where they actually
+            // until that is resolved.
-                // belong until that is resolved.
+            let _: ::vulkano::buffer::AssertParamIsBufferContents<#ty>;
-                #[allow(unused)]
-                fn bound #impl_generics () #where_clause {
-                    fn assert_impl<T: ::#crate_ident::buffer::BufferContents + ?Sized>() {}
-                    assert_impl::<#ty>();
-                }
-            };
         }
     });
 
@@ -187,11 +181,11 @@ pub fn derive_buffer_contents(crate_ident: &Ident, mut ast: DeriveInput) -> Resu
 
             #[inline(always)]
             unsafe fn ptr_from_slice(slice: ::std::ptr::NonNull<[u8]>) -> *mut Self {
+                #( #bounds )*
+
                 #ptr_from_slice
             }
         }
-
-        #( #bounds )*
     })
 }
 

vulkano/src/buffer/mod.rs

@@ -92,6 +92,7 @@ use std::{
     error::Error,
     fmt::{Display, Formatter},
     hash::{Hash, Hasher},
+    marker::PhantomData,
     ops::Range,
     sync::Arc,
 };
@@ -1066,3 +1067,7 @@ impl From<Subbuffer<[u32]>> for IndexBuffer {
         Self::U32(value)
     }
 }
+
+/// This is intended for use by the `BufferContents` derive macro only.
+#[doc(hidden)]
+pub struct AssertParamIsBufferContents<T: BufferContents + ?Sized>(PhantomData<T>);