auto merge of #2660 : glennw/servo/mako-warnings, r=jdm

This commit is contained in:
bors-servo 2014-06-18 12:26:18 -04:00
commit bace9fb485

View file

@ -1655,7 +1655,7 @@ fn cascade_with_cached_declarations(applicable_declarations: &[MatchedProperty],
% for style_struct in STYLE_STRUCTS: % for style_struct in STYLE_STRUCTS:
% for property in style_struct.longhands: % for property in style_struct.longhands:
% if property.derived_from is None: % if property.derived_from is None:
${property.camel_case}Declaration(ref declared_value) => { ${property.camel_case}Declaration(ref ${'_' if not style_struct.inherited else ''}declared_value) => {
% if style_struct.inherited: % if style_struct.inherited:
if seen.get_${property.ident}() { if seen.get_${property.ident}() {
continue continue