refactor(headers): Use macros for headers where possible

src/header/common/accept.rs

@@ -1,9 +1,6 @@
-use std::fmt;
+use mime::Mime;
 
-use header;
-use header::parsing;
-
-use mime;
+use header::QualityItem;
 
 /// The `Accept` header.
 ///
@@ -26,43 +23,36 @@ use mime;
 ///     qitem(Mime(Text, Xml, vec![])) ]));
 /// ```
 #[derive(Clone, PartialEq, Debug)]
-pub struct Accept(pub Vec<header::QualityItem<mime::Mime>>);
+pub struct Accept(pub Vec<QualityItem<Mime>>);
 
-deref!(Accept => Vec<header::QualityItem<mime::Mime>>);
+impl_list_header!(Accept,
+                  "Accept",
+                  Vec<QualityItem<Mime>>);
 
-impl header::Header for Accept {
-    fn header_name() -> &'static str {
-        "Accept"
+#[cfg(test)]
+mod tests {
+    use mime::*;
+
+    use header::{Header, QualityItem, qitem};
+    use super::Accept;
+
+    #[test]
+    fn test_parse_header_no_quality() {
+        let a: Accept = Header::parse_header([b"text/plain; charset=utf-8".to_vec()].as_slice()).unwrap();
+        let b = Accept(vec![
+            qitem(Mime(TopLevel::Text, SubLevel::Plain, vec![(Attr::Charset, Value::Utf8)])),
+        ]);
+        assert_eq!(a, b);
     }
 
-    fn parse_header(raw: &[Vec<u8>]) -> Option<Accept> {
-        // TODO: Return */* if no value is given.
-        parsing::from_comma_delimited(raw).map(Accept)
-    }
-}
-
-impl header::HeaderFormat for Accept {
-    fn fmt_header(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
-        parsing::fmt_comma_delimited(fmt, &self[])
+    #[test]
+    fn test_parse_header_with_quality() {
+        let a: Accept = Header::parse_header([b"text/plain; charset=utf-8; q=0.5".to_vec()].as_slice()).unwrap();
+        let b = Accept(vec![
+            QualityItem::new(Mime(TopLevel::Text, SubLevel::Plain, vec![(Attr::Charset, Value::Utf8)]), 0.5f32),
+        ]);
+        assert_eq!(a, b);
     }
 }
 
 bench_header!(bench, Accept, { vec![b"text/plain; q=0.5, text/html".to_vec()] });
-
-#[test]
-fn test_parse_header_no_quality() {
-    let a: Accept = header::Header::parse_header([b"text/plain; charset=utf-8".to_vec()].as_slice()).unwrap();
-    let b = Accept(vec![
-        header::QualityItem{item: mime::Mime(mime::TopLevel::Text, mime::SubLevel::Plain, vec![(mime::Attr::Charset, mime::Value::Utf8)]), quality: 1f32},
-    ]);
-    assert_eq!(a, b);
-}
-
-#[test]
-fn test_parse_header_with_quality() {
-    let a: Accept = header::Header::parse_header([b"text/plain; charset=utf-8; q=0.5".to_vec()].as_slice()).unwrap();
-    let b = Accept(vec![
-        header::QualityItem{item: mime::Mime(mime::TopLevel::Text, mime::SubLevel::Plain, vec![(mime::Attr::Charset, mime::Value::Utf8)]), quality: 0.5f32},
-    ]);
-    assert_eq!(a, b);
-}