Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-01 19:50:30 +01:00
Code Issues Projects Releases Packages Wiki Activity

Limit trait bounds for derive(ToCss) to types with free variables

Browse source
This commit is contained in:
Anthony Ramine 2017-06-16 14:52:36 +02:00
parent d65a7e6f95
commit b7c83eeb64
2 changed files with 32 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
components/style_derive/Cargo.toml
View file

@ -11,5 +11,5 @@ proc-macro = true
[dependencies] [dependencies]
quote = "0.3" quote = "0.3"
syn = "0.11" syn = { version = "0.11", features = ["visit"] }
synstructure = "0.5.2" synstructure = "0.5.2"

33
components/style_derive/to_css.rs
View file

@ -18,12 +18,16 @@ pub fn derive(input: syn::DeriveInput) -> quote::Tokens {
let match_body = synstructure::each_variant(&input, &style, |bindings, variant| { let match_body = synstructure::each_variant(&input, &style, |bindings, variant| {
let mut identifier = to_css_identifier(variant.ident.as_ref()); let mut identifier = to_css_identifier(variant.ident.as_ref());
let mut expr = if let Some((first, rest)) = bindings.split_first() { let mut expr = if let Some((first, rest)) = bindings.split_first() {
where_clause.predicates.push(where_predicate(first.field.ty.clone())); if has_free_params(&first.field.ty, &input.generics.ty_params) {
where_clause.predicates.push(where_predicate(first.field.ty.clone()));
}
let mut expr = quote! { let mut expr = quote! {
::style_traits::ToCss::to_css(#first, dest) ::style_traits::ToCss::to_css(#first, dest)
}; };
for binding in rest { for binding in rest {
where_clause.predicates.push(where_predicate(binding.field.ty.clone())); if has_free_params(&binding.field.ty, &input.generics.ty_params) {
where_clause.predicates.push(where_predicate(binding.field.ty.clone()));
}
expr = quote! { expr = quote! {
#expr?; #expr?;
::std::fmt::Write::write_str(dest, " ")?; ::std::fmt::Write::write_str(dest, " ")?;
@ -90,6 +94,31 @@ pub fn derive(input: syn::DeriveInput) -> quote::Tokens {
} }
} }
/// Returns whether `ty` is parameterized by any parameter from `params`.
fn has_free_params(ty: &syn::Ty, params: &[syn::TyParam]) -> bool {
use syn::visit::Visitor;
struct HasFreeParams<'a> {
params: &'a [syn::TyParam],
has_free: bool,
}
impl<'a> Visitor for HasFreeParams<'a> {
fn visit_path(&mut self, path: &syn::Path) {
if !path.global && path.segments.len() == 1 {
if self.params.iter().any(|param| param.ident == path.segments[0].ident) {
self.has_free = true;
}
}
syn::visit::walk_path(self, path);
}
}
let mut visitor = HasFreeParams { params: params, has_free: false };
visitor.visit_ty(ty);
visitor.has_free
}
/// `#ty: ::style_traits::ToCss` /// `#ty: ::style_traits::ToCss`
fn where_predicate(ty: syn::Ty) -> syn::WherePredicate { fn where_predicate(ty: syn::Ty) -> syn::WherePredicate {
syn::WherePredicate::BoundPredicate(syn::WhereBoundPredicate { syn::WherePredicate::BoundPredicate(syn::WhereBoundPredicate {