From fcfb0505dd4f96468f721bf31451468ee6fb3ef2 Mon Sep 17 00:00:00 2001
From: Sean McArthur <sean.monstar@gmail.com>
Date: Mon, 10 Nov 2014 11:13:20 -0800
Subject: [PATCH] update to newest cookie-rs

---
 src/header/common/cookie.rs     | 2 +-
 src/header/common/mod.rs        | 6 ------
 src/header/common/set_cookie.rs | 3 +--
 3 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/src/header/common/cookie.rs b/src/header/common/cookie.rs
index 70f241d1..53228131 100644
--- a/src/header/common/cookie.rs
+++ b/src/header/common/cookie.rs
@@ -51,7 +51,7 @@ impl HeaderFormat for Cookies {
         let cookies = &self.0;
         let last = cookies.len() - 1;
         for (i, cookie) in cookies.iter().enumerate() {
-            try!(write!(fmt, "{}={}", cookie.name, cookie.value));
+            try!(cookie.pair().fmt(fmt));
             if i < last {
                 try!("; ".fmt(fmt));
             }
diff --git a/src/header/common/mod.rs b/src/header/common/mod.rs
index f8b9b84d..0120a776 100644
--- a/src/header/common/mod.rs
+++ b/src/header/common/mod.rs
@@ -33,12 +33,6 @@ pub mod authorization;
 /// Exposes the Cookie header.
 pub mod cookie;
 
-/// Exposes the Cookie header.
-pub mod cookie;
-
-/// Exposes the Set-Cookie header.
-pub mod set_cookie;
-
 /// Exposes the Connection header.
 pub mod connection;
 
diff --git a/src/header/common/set_cookie.rs b/src/header/common/set_cookie.rs
index 0db48a27..77f18a3e 100644
--- a/src/header/common/set_cookie.rs
+++ b/src/header/common/set_cookie.rs
@@ -59,8 +59,7 @@ impl SetCookie {
     /// Use this to create SetCookie header from CookieJar using
     /// calculated delta.
     pub fn from_cookie_jar(jar: &CookieJar) -> SetCookie {
-        //FIXME: https://github.com/alexcrichton/cookie-rs/issues/2
-        SetCookie(jar.delta().into_iter().map(|s| from_str(s[]).unwrap()).collect())
+        SetCookie(jar.delta())
     }
 }