favor insert_header over apply_header

This also implements `Header for T` and provides generic conversions between `Header` and `HeaderName` / `HeaderValue`

Author: yoshuawuyts

src/auth/authorization.rs

@@ -21,7 +21,7 @@ use crate::headers::{Header, HeaderName, HeaderValue, Headers, AUTHORIZATION};
 /// let authz = Authorization::new(scheme, credentials.into());
 ///
 /// let mut res = Response::new(200);
-/// authz.apply_header(&mut res);
+/// res.insert_header(&authz, &authz);
 ///
 /// let authz = Authorization::from_headers(res)?.unwrap();
 ///

src/auth/basic_auth.rs

@@ -25,7 +25,7 @@ use crate::{bail_status as bail, ensure_status as ensure};
 /// let authz = BasicAuth::new(username, password);
 ///
 /// let mut res = Response::new(200);
-/// authz.apply_header(&mut res);
+/// res.insert_header(&authz, &authz);
 ///
 /// let authz = BasicAuth::from_headers(res)?.unwrap();
 ///

src/auth/www_authenticate.rs

@@ -27,7 +27,7 @@ use crate::{auth::AuthenticationScheme, headers::Header};
 /// let authz = WwwAuthenticate::new(scheme, realm.into());
 ///
 /// let mut res = Response::new(200);
-/// authz.apply_header(&mut res);
+/// res.insert_header(&authz, &authz);
 ///
 /// let authz = WwwAuthenticate::from_headers(res)?.unwrap();
 ///

src/cache/age.rs

@@ -22,7 +22,7 @@ use std::time::Duration;
 /// let age = Age::from_secs(12);
 ///
 /// let mut res = Response::new(200);
-/// age.apply_header(&mut res);
+/// res.insert_header(&age, &age);
 ///
 /// let age = Age::from_headers(res)?.unwrap();
 /// assert_eq!(age, Age::from_secs(12));
@@ -69,14 +69,6 @@ impl Age {
     }
 }
 
-impl ToHeaderValues for Age {
-    type Iter = option::IntoIter<HeaderValue>;
-    fn to_header_values(&self) -> crate::Result<Self::Iter> {
-        // A HeaderValue will always convert into itself.
-        Ok(self.header_value().to_header_values().unwrap())
-    }
-}
-
 impl Header for Age {
     fn header_name(&self) -> HeaderName {
         AGE

src/cache/cache_control/cache_control.rs

@@ -22,7 +22,7 @@ use std::slice;
 /// entries.push(CacheDirective::NoStore);
 ///
 /// let mut res = Response::new(200);
-/// entries.apply_header(&mut res);
+/// res.insert_header(&entries, &entries);
 ///
 /// let entries = CacheControl::from_headers(res)?.unwrap();
 /// let mut entries = entries.iter();
@@ -189,14 +189,6 @@ impl<'a> Iterator for IterMut<'a> {
     }
 }
 
-impl ToHeaderValues for CacheControl {
-    type Iter = option::IntoIter<HeaderValue>;
-    fn to_header_values(&self) -> crate::Result<Self::Iter> {
-        // A HeaderValue will always convert into itself.
-        Ok(self.header_value().to_header_values().unwrap())
-    }
-}
-
 impl Debug for CacheControl {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         let mut list = f.debug_list();

src/cache/clear_site_data/mod.rs

@@ -36,7 +36,7 @@ use headers::Header;
 /// entries.push(ClearDirective::Cookies);
 ///
 /// let mut res = Response::new(200);
-/// entries.apply_header(&mut res);
+/// res.insert_header(&entries, &entries);
 ///
 /// let entries = ClearSiteData::from_headers(res)?.unwrap();
 /// let mut entries = entries.iter();
@@ -201,14 +201,6 @@ impl<'a> Iterator for IterMut<'a> {
     }
 }
 
-impl ToHeaderValues for ClearSiteData {
-    type Iter = option::IntoIter<HeaderValue>;
-    fn to_header_values(&self) -> crate::Result<Self::Iter> {
-        // A HeaderValue will always convert into itself.
-        Ok(self.header_value().to_header_values().unwrap())
-    }
-}
-
 impl Debug for ClearSiteData {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         let mut list = f.debug_list();

src/cache/expires.rs

@@ -1,8 +1,7 @@
-use crate::headers::{Header, HeaderName, HeaderValue, Headers, ToHeaderValues, EXPIRES};
+use crate::headers::{Header, HeaderName, HeaderValue, Headers, EXPIRES};
 use crate::utils::{fmt_http_date, parse_http_date};
 
 use std::fmt::Debug;
-use std::option;
 use std::time::{Duration, SystemTime};
 
 /// HTTP `Expires` header
@@ -24,7 +23,7 @@ use std::time::{Duration, SystemTime};
 /// let expires = Expires::new_at(time);
 ///
 /// let mut res = Response::new(200);
-/// expires.apply_header(&mut res);
+/// res.insert_header(&expires, &expires);
 ///
 /// let expires = Expires::from_headers(res)?.unwrap();
 ///
@@ -84,14 +83,6 @@ impl Header for Expires {
     }
 }
 
-impl ToHeaderValues for Expires {
-    type Iter = option::IntoIter<HeaderValue>;
-    fn to_header_values(&self) -> crate::Result<Self::Iter> {
-        // A HeaderValue will always convert into itself.
-        Ok(self.header_value().to_header_values().unwrap())
-    }
-}
-
 #[cfg(test)]
 mod test {
     use super::*;

src/conditional/etag.rs

@@ -24,7 +24,7 @@ use std::option;
 /// let etag = ETag::new("0xcafebeef".to_string());
 ///
 /// let mut res = Response::new(200);
-/// etag.apply_header(&mut res);
+/// res.insert_header(&etag, &etag);
 ///
 /// let etag = ETag::from_headers(res)?.unwrap();
 /// assert_eq!(etag, ETag::Strong(String::from("0xcafebeef")));
@@ -133,14 +133,6 @@ impl Display for ETag {
     }
 }
 
-impl ToHeaderValues for ETag {
-    type Iter = option::IntoIter<HeaderValue>;
-    fn to_header_values(&self) -> crate::Result<Self::Iter> {
-        // A HeaderValue will always convert into itself.
-        Ok(self.header_value().to_header_values().unwrap())
-    }
-}
-
 #[cfg(test)]
 mod test {
     use super::*;

src/conditional/if_match.rs

@@ -27,7 +27,7 @@ use std::slice;
 /// entries.push(ETag::new("0xbeefcafe".to_string()));
 ///
 /// let mut res = Response::new(200);
-/// entries.apply_header(&mut res);
+/// res.insert_header(&entries, &entries);
 ///
 /// let entries = IfMatch::from_headers(res)?.unwrap();
 /// let mut entries = entries.iter();
@@ -217,14 +217,6 @@ impl<'a> Iterator for IterMut<'a> {
     }
 }
 
-impl ToHeaderValues for IfMatch {
-    type Iter = option::IntoIter<HeaderValue>;
-    fn to_header_values(&self) -> crate::Result<Self::Iter> {
-        // A HeaderValue will always convert into itself.
-        Ok(self.header_value().to_header_values().unwrap())
-    }
-}
-
 impl Debug for IfMatch {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         let mut list = f.debug_list();

src/conditional/if_modified_since.rs

@@ -25,7 +25,7 @@ use std::time::SystemTime;
 /// let expires = IfModifiedSince::new(time);
 ///
 /// let mut res = Response::new(200);
-/// expires.apply_header(&mut res);
+/// res.insert_header(&expires, &expires);
 ///
 /// let expires = IfModifiedSince::from_headers(res)?.unwrap();
 ///
@@ -67,14 +67,6 @@ impl IfModifiedSince {
     }
 }
 
-impl ToHeaderValues for IfModifiedSince {
-    type Iter = option::IntoIter<HeaderValue>;
-    fn to_header_values(&self) -> crate::Result<Self::Iter> {
-        // A HeaderValue will always convert into itself.
-        Ok(self.header_value().to_header_values().unwrap())
-    }
-}
-
 impl Header for IfModifiedSince {
     fn header_name(&self) -> HeaderName {
         IF_MODIFIED_SINCE