Merge pull request #67 from servo/to_css-merged

Modernize the ToCss trait and implement it on more things.

Author: SimonSapin

Cargo.toml

@@ -14,3 +14,4 @@ license = "MPL-2.0"
 
 [dependencies]
 encoding = "0.2"
+text_writer = "0.1.1"

src/ast.rs

@@ -69,19 +69,6 @@ pub enum ComponentValue {
 }
 
 
-impl ComponentValue {
-    pub fn to_css(&self) -> String {
-        let mut css = String::new();
-        self.to_css_push(&mut css);
-        css
-    }
-
-    pub fn to_css_push(&self, css: &mut String) {
-        ::serializer::to_css_push(self, css)
-    }
-}
-
-
 #[deriving(PartialEq)]
 pub struct Declaration {
     pub location: SourceLocation,

src/color.rs

@@ -6,8 +6,11 @@ use std::ascii::AsciiExt;
 use std::fmt;
 use std::num::{Float, FloatMath};
 
+use text_writer::{mod, TextWriter};
+
 use ast::{ComponentValue, SkipWhitespaceIterable};
 use ast::ComponentValue::{Number, Percentage, Function, Ident, Hash, IDHash, Comma};
+use serializer::ToCss;
 
 
 #[deriving(Clone, Copy, PartialEq)]
@@ -20,14 +23,19 @@ pub struct RGBA {
     pub alpha: f32,
 }
 
-impl fmt::Show for RGBA {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+impl ToCss for RGBA {
+    fn to_css<W>(&self, dest: &mut W) -> text_writer::Result where W: TextWriter {
         if self.alpha == 1f32 {
-            write!(f, "rgb({}, {}, {})", (self.red * 255.).round(), (self.green * 255.).round(),
+            write!(dest, "rgb({}, {}, {})",
+                   (self.red * 255.).round(),
+                   (self.green * 255.).round(),
                    (self.blue * 255.).round())
         } else {
-            write!(f, "rgba({}, {}, {}, {})", (self.red * 255.).round(), (self.green * 255.).round(),
-                   (self.blue * 255.).round(), self.alpha)
+            write!(dest, "rgba({}, {}, {}, {})",
+                   (self.red * 255.).round(),
+                   (self.green * 255.).round(),
+                   (self.blue * 255.).round(),
+                   self.alpha)
         }
     }
 }
@@ -38,15 +46,23 @@ pub enum Color {
     RGBA(RGBA),
 }
 
-impl fmt::Show for Color {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+impl ToCss for Color {
+    fn to_css<W>(&self, dest: &mut W) -> text_writer::Result where W: TextWriter {
         match self {
-            &Color::CurrentColor => write!(f, "currentColor"),
-            &Color::RGBA(c) => write!(f, "{}", c),
+            &Color::CurrentColor => dest.write_str("currentColor"),
+            &Color::RGBA(rgba) => rgba.to_css(dest),
         }
     }
 }
 
+impl fmt::Show for RGBA {
+    #[inline] fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { self.fmt_to_css(f) }
+}
+
+impl fmt::Show for Color {
+    #[inline] fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { self.fmt_to_css(f) }
+}
+
 /// Return `Err(())` on invalid or unsupported value (not a color).
 impl Color {
     pub fn parse(component_value: &ComponentValue) -> Result<Color, ()> {

src/lib.rs

@@ -7,7 +7,8 @@
 
 #![feature(globs, macro_rules)]
 
-extern crate encoding;  // https://github.com/lifthrasiir/rust-encoding
+extern crate encoding;
+extern crate text_writer;
 
 #[cfg(test)]
 extern crate test;
@@ -24,7 +25,7 @@ pub use parser::{parse_stylesheet_rules, StylesheetParser,
 pub use from_bytes::{decode_stylesheet_bytes, parse_stylesheet_rules_from_bytes};
 pub use color::{RGBA, Color};
 pub use nth::parse_nth;
-pub use serializer::{ToCss, serialize_identifier, serialize_string};
+pub use serializer::{ToCss, CssStringWriter, serialize_identifier, serialize_string};
 
 pub mod ast;
 mod tokenizer;