Implement metatype proc-macro

crates/luaffi_impl/src/cdef.rs

@@ -51,8 +51,8 @@ fn generate_type(ty: &Ident) -> Result<TokenStream> {
                 #fmt(#cdecl_fmt)
             }
 
-            fn build(s: &mut #ffi::TypeBuilder) {
-                s.cdef::<Self>().metatype::<Self>();
+            fn build(b: &mut #ffi::TypeBuilder) {
+                b.cdef::<Self>().metatype::<Self>();
             }
         }
     })
@@ -71,7 +71,7 @@ fn generate_cdef_structure(str: &mut ItemStruct) -> Result<TokenStream> {
 
     Ok(quote! {
         unsafe impl #ffi::CDef for #ty {
-            fn build(s: &mut #ffi::CDefBuilder) { #build }
+            fn build(b: &mut #ffi::CDefBuilder) { #build }
         }
     })
 }
@@ -90,20 +90,19 @@ fn generate_cdef_enum(enu: &mut ItemEnum) -> Result<TokenStream> {
         .iter_mut()
         .map(|variant| {
             let build = generate_build_cdef(&to_cfields(&mut variant.fields)?)?;
-            Ok(quote! { s.inner_struct(|s| { #build }); })
+            Ok(quote! { b.inner_struct(|b| { #build }); })
         })
         .collect::<Result<Vec<_>>>()?;
 
     Ok(quote! {
         unsafe impl #ffi::CDef for #ty {
-            fn build(s: &mut #ffi::CDefBuilder) {
-                s.field::<::std::ffi::c_int>("__tag").inner_union(|s| { #(#build)* });
+            fn build(b: &mut #ffi::CDefBuilder) {
+                b.field::<::std::ffi::c_int>("__tag").inner_union(|b| { #(#build)* });
             }
         }
     })
 }
 
-#[derive(Debug)]
 struct CField {
     name: String,
     ty: Type,
@@ -130,7 +129,7 @@ fn to_cfields(fields: &mut Fields) -> Result<Vec<CField>> {
     .collect()
 }
 
-#[derive(Debug, Default)]
+#[derive(Default)]
 struct CFieldAttrs {
     opaque: bool,
 }
@@ -189,14 +188,14 @@ fn generate_build_cdef(fields: &[CField]) -> Result<TokenStream> {
         if field.attrs.opaque {
             body.push(if i == len - 1 {
                 let a = offset(i);
-                quote! { s.field_opaque(size - #a); } // last field
+                quote! { b.field_opaque(size - #a); } // last field
             } else {
                 let a = offset(i);
                 let b = offset(i + 1);
-                quote! { s.field_opaque(#b - #a); }
+                quote! { b.field_opaque(#b - #a); }
             });
         } else {
-            body.push(quote! { s.field::<#ty>(#name); });
+            body.push(quote! { b.field::<#ty>(#name); });
         }
     }