Restore manganis optimizations (#3195)
* Create a crate for constant serialization of config structs for manganis * use SerializeConst for the image asset builder * switch to a declarative macro for assets * add serializable options for each asset type * implement the new manganis macro * optimize assets in the CLI * Fix assets with dioxus formattable * reduce fuzzing test limits * use the new syntax in examples * fix avif support * Fix manganis doc tests * cache asset optimization * Split out asset and bundled asset * make hash pointer width independent * Fix manganis macro docs * add constvec::is_empty method to fix clippy lint * remove nasm feature * simplify test_rsplit_once test so typos passes * revert example change from clippy fix * always accept unix paths * fix windows path seperator * fix folder asset hash * Optimize assets in a blocking task * Fix asset options docs * Document Asset and BundledAsset * simplify the linker macro a bit * add more docs to AssetParser expansion * add image format helpers * Split by both unix and windows path separators and take the smallest one
This commit is contained in:
Evan Almloff authored and GitHub committed
1 parent
31d72db82d
commit
f9617c8d33
64 files changed
+6233
-704
No files matched your search
@@ -0,0 +1,207 @@
|
||||
use proc_macro::TokenStream;
|
||||
use quote::{quote, ToTokens};
|
||||
use syn::{parse_macro_input, DeriveInput, LitInt};
|
||||
use syn::{parse_quote, Generics, WhereClause, WherePredicate};
|
||||
|
||||
fn add_bounds(where_clause: &mut Option<WhereClause>, generics: &Generics) {
|
||||
let bounds = generics.params.iter().filter_map(|param| match param {
|
||||
syn::GenericParam::Type(ty) => {
|
||||
Some::<WherePredicate>(parse_quote! { #ty: const_serialize::SerializeConst, })
|
||||
}
|
||||
syn::GenericParam::Lifetime(_) => None,
|
||||
syn::GenericParam::Const(_) => None,
|
||||
});
|
||||
if let Some(clause) = where_clause {
|
||||
clause.predicates.extend(bounds);
|
||||
} else {
|
||||
*where_clause = Some(parse_quote! { where #(#bounds)* });
|
||||
}
|
||||
}
|
||||
|
||||
/// Derive the const serialize trait for a struct
|
||||
#[proc_macro_derive(SerializeConst)]
|
||||
pub fn derive_parse(input: TokenStream) -> TokenStream {
|
||||
// Parse the input tokens into a syntax tree
|
||||
let input = parse_macro_input!(input as DeriveInput);
|
||||
|
||||
match input.data {
|
||||
syn::Data::Struct(data) => match data.fields {
|
||||
syn::Fields::Unnamed(_) | syn::Fields::Named(_) => {
|
||||
let ty = &input.ident;
|
||||
let (impl_generics, ty_generics, where_clause) = input.generics.split_for_impl();
|
||||
let mut where_clause = where_clause.cloned();
|
||||
add_bounds(&mut where_clause, &input.generics);
|
||||
let field_names = data.fields.iter().enumerate().map(|(i, field)| {
|
||||
field
|
||||
.ident
|
||||
.as_ref()
|
||||
.map(|ident| ident.to_token_stream())
|
||||
.unwrap_or_else(|| {
|
||||
LitInt::new(&i.to_string(), proc_macro2::Span::call_site())
|
||||
.into_token_stream()
|
||||
})
|
||||
});
|
||||
let field_types = data.fields.iter().map(|field| &field.ty);
|
||||
quote! {
|
||||
unsafe impl #impl_generics const_serialize::SerializeConst for #ty #ty_generics #where_clause {
|
||||
const MEMORY_LAYOUT: const_serialize::Layout = const_serialize::Layout::Struct(const_serialize::StructLayout::new(
|
||||
std::mem::size_of::<Self>(),
|
||||
&[#(
|
||||
const_serialize::StructFieldLayout::new(
|
||||
std::mem::offset_of!(#ty, #field_names),
|
||||
<#field_types as const_serialize::SerializeConst>::MEMORY_LAYOUT,
|
||||
),
|
||||
)*],
|
||||
));
|
||||
}
|
||||
}.into()
|
||||
}
|
||||
syn::Fields::Unit => {
|
||||
let ty = &input.ident;
|
||||
let (impl_generics, ty_generics, where_clause) = input.generics.split_for_impl();
|
||||
let mut where_clause = where_clause.cloned();
|
||||
add_bounds(&mut where_clause, &input.generics);
|
||||
quote! {
|
||||
unsafe impl #impl_generics const_serialize::SerializeConst for #ty #ty_generics #where_clause {
|
||||
const MEMORY_LAYOUT: const_serialize::Layout = const_serialize::Layout::Struct(const_serialize::StructLayout::new(
|
||||
std::mem::size_of::<Self>(),
|
||||
&[],
|
||||
));
|
||||
}
|
||||
}.into()
|
||||
}
|
||||
},
|
||||
syn::Data::Enum(data) => match data.variants.len() {
|
||||
0 => syn::Error::new(input.ident.span(), "Enums must have at least one variant")
|
||||
.to_compile_error()
|
||||
.into(),
|
||||
1.. => {
|
||||
let mut repr_c = false;
|
||||
let mut discriminant_size = None;
|
||||
for attr in &input.attrs {
|
||||
if attr.path().is_ident("repr") {
|
||||
if let Err(err) = attr.parse_nested_meta(|meta| {
|
||||
// #[repr(C)]
|
||||
if meta.path.is_ident("C") {
|
||||
repr_c = true;
|
||||
return Ok(());
|
||||
}
|
||||
|
||||
// #[repr(u8)]
|
||||
if meta.path.is_ident("u8") {
|
||||
discriminant_size = Some(1);
|
||||
return Ok(());
|
||||
}
|
||||
|
||||
// #[repr(u16)]
|
||||
if meta.path.is_ident("u16") {
|
||||
discriminant_size = Some(2);
|
||||
return Ok(());
|
||||
}
|
||||
|
||||
// #[repr(u32)]
|
||||
if meta.path.is_ident("u32") {
|
||||
discriminant_size = Some(3);
|
||||
return Ok(());
|
||||
}
|
||||
|
||||
// #[repr(u64)]
|
||||
if meta.path.is_ident("u64") {
|
||||
discriminant_size = Some(4);
|
||||
return Ok(());
|
||||
}
|
||||
|
||||
Err(meta.error("unrecognized repr"))
|
||||
}) {
|
||||
return err.to_compile_error().into();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
let variants_have_fields = data
|
||||
.variants
|
||||
.iter()
|
||||
.any(|variant| !variant.fields.is_empty());
|
||||
if !repr_c && variants_have_fields {
|
||||
return syn::Error::new(input.ident.span(), "Enums must be repr(C, u*)")
|
||||
.to_compile_error()
|
||||
.into();
|
||||
}
|
||||
|
||||
if discriminant_size.is_none() {
|
||||
return syn::Error::new(input.ident.span(), "Enums must be repr(u*)")
|
||||
.to_compile_error()
|
||||
.into();
|
||||
}
|
||||
|
||||
let ty = &input.ident;
|
||||
let (impl_generics, ty_generics, where_clause) = input.generics.split_for_impl();
|
||||
let mut where_clause = where_clause.cloned();
|
||||
add_bounds(&mut where_clause, &input.generics);
|
||||
let mut last_discriminant = None;
|
||||
let variants = data.variants.iter().map(|variant| {
|
||||
let discriminant = variant
|
||||
.discriminant
|
||||
.as_ref()
|
||||
.map(|(_, discriminant)| discriminant.to_token_stream())
|
||||
.unwrap_or_else(|| match &last_discriminant {
|
||||
Some(discriminant) => quote! { #discriminant + 1 },
|
||||
None => {
|
||||
quote! { 0 }
|
||||
}
|
||||
});
|
||||
last_discriminant = Some(discriminant.clone());
|
||||
let field_names = variant.fields.iter().enumerate().map(|(i, field)| {
|
||||
field
|
||||
.ident
|
||||
.clone()
|
||||
.unwrap_or_else(|| quote::format_ident!("__field_{}", i))
|
||||
});
|
||||
let field_types = variant.fields.iter().map(|field| &field.ty);
|
||||
let generics = &input.generics;
|
||||
quote! {
|
||||
{
|
||||
#[allow(unused)]
|
||||
#[derive(const_serialize::SerializeConst)]
|
||||
#[repr(C)]
|
||||
struct VariantStruct #generics {
|
||||
#(
|
||||
#field_names: #field_types,
|
||||
)*
|
||||
}
|
||||
const_serialize::EnumVariant::new(
|
||||
#discriminant as u32,
|
||||
match VariantStruct::MEMORY_LAYOUT {
|
||||
const_serialize::Layout::Struct(layout) => layout,
|
||||
_ => panic!("VariantStruct::MEMORY_LAYOUT must be a struct"),
|
||||
},
|
||||
std::mem::align_of::<VariantStruct>(),
|
||||
)
|
||||
}
|
||||
}
|
||||
});
|
||||
quote! {
|
||||
unsafe impl #impl_generics const_serialize::SerializeConst for #ty #ty_generics #where_clause {
|
||||
const MEMORY_LAYOUT: const_serialize::Layout = const_serialize::Layout::Enum(const_serialize::EnumLayout::new(
|
||||
std::mem::size_of::<Self>(),
|
||||
const_serialize::PrimitiveLayout::new(
|
||||
#discriminant_size as usize,
|
||||
),
|
||||
{
|
||||
const DATA: &'static [const_serialize::EnumVariant] = &[
|
||||
#(
|
||||
#variants,
|
||||
)*
|
||||
];
|
||||
DATA
|
||||
},
|
||||
));
|
||||
}
|
||||
}.into()
|
||||
}
|
||||
},
|
||||
_ => syn::Error::new(input.ident.span(), "Only structs and enums are supported")
|
||||
.to_compile_error()
|
||||
.into(),
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user