servo: Merge #19981 - style: Derive ToCss for FontFamilyList (from emilio:nicer); r=nox

The extra reference in to_css is needed because the family list iterator returns
by value in Gecko.

Source-Repo: https://github.com/servo/servo
Source-Revision: 10552c23fc6c81b37bcfcba8f35430fc8d6a0ea8

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : 14ef251be1b3c52dc0e16d3ad29508c23e8279ca

servo/components/style/values/specified/font.rs

@@ -165,9 +165,10 @@ impl From<LengthOrPercentage> for FontSize {
 }
 
 /// Specifies a prioritized list of font family names or generic family names.
-#[derive(Clone, Debug, Eq, Hash, PartialEq)]
+#[derive(Clone, Debug, Eq, Hash, PartialEq, ToCss)]
 pub enum FontFamily {
     /// List of `font-family`
+    #[css(iterable, comma)]
     Values(FontFamilyList),
     /// System font
     System(SystemFont),
@@ -245,26 +246,6 @@ impl MallocSizeOf for FontFamily {
     }
 }
 
-impl ToCss for FontFamily {
-    fn to_css<W>(&self, dest: &mut CssWriter<W>) -> fmt::Result
-    where
-        W: Write,
-    {
-        match *self {
-            FontFamily::Values(ref v) => {
-                let mut iter = v.iter();
-                iter.next().unwrap().to_css(dest)?;
-                for family in iter {
-                    dest.write_str(", ")?;
-                    family.to_css(dest)?;
-                }
-                Ok(())
-            }
-            FontFamily::System(sys) => sys.to_css(dest),
-        }
-    }
-}
-
 impl Parse for FontFamily {
     /// <family-name>#
     /// <family-name> = <string> | [ <ident>+ ]

servo/components/style_derive/to_css.rs

@@ -44,7 +44,7 @@ pub fn derive(input: DeriveInput) -> Tokens {
                     #expr
 
                     for item in #binding.iter() {
-                        writer.item(item)?;
+                        writer.item(&item)?;
                     }
                 };
             } else {