From 537fda543e4c8f6512ede65369e8a29dc753686b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= Date: Sun, 31 Dec 2017 09:29:35 +0100 Subject: [PATCH] style_derive: Support parse-time aliases. This will allow #19659 to use derive on display using: #[parse(aliases = "-webkit-flex")] Flex, #[parse(aliases = "-webkit-inline-flex")] InlineFlex, And such. --- components/style_derive/lib.rs | 2 +- components/style_derive/parse.rs | 22 ++++++++++++++++++++++ 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/components/style_derive/lib.rs b/components/style_derive/lib.rs index cbe33a3d199..a9a8a32dbf7 100644 --- a/components/style_derive/lib.rs +++ b/components/style_derive/lib.rs @@ -39,7 +39,7 @@ pub fn derive_to_animated_value(stream: TokenStream) -> TokenStream { to_animated_value::derive(input).to_string().parse().unwrap() } -#[proc_macro_derive(Parse)] +#[proc_macro_derive(Parse, attributes(parse))] pub fn derive_parse(stream: TokenStream) -> TokenStream { let input = syn::parse_derive_input(&stream.to_string()).unwrap(); parse::derive(input).to_string().parse().unwrap() diff --git a/components/style_derive/parse.rs b/components/style_derive/parse.rs index 41fc74bb733..cac626749bd 100644 --- a/components/style_derive/parse.rs +++ b/components/style_derive/parse.rs @@ -19,11 +19,25 @@ pub fn derive(input: DeriveInput) -> Tokens { "Parse is only supported for single-variant enums for now" ); + let variant_attrs = cg::parse_variant_attrs::(variant); let identifier = cg::to_css_identifier(variant.ident.as_ref()); let ident = &variant.ident; + match_body = quote! { #match_body #identifier => Ok(#name::#ident), + }; + + let aliases = match variant_attrs.aliases { + Some(aliases) => aliases, + None => return, + }; + + for alias in aliases.split(",") { + match_body = quote! { + #match_body + #alias => Ok(#name::#ident), + }; } }); @@ -73,3 +87,11 @@ pub fn derive(input: DeriveInput) -> Tokens { #methods_impl } } + +#[darling(attributes(parse), default)] +#[derive(Default, FromVariant)] +struct ParseVariantAttrs { + /// The comma-separated list of aliases this variant should be aliased to at + /// parse time. + aliases: Option, +}