feat(header): implement fmt::Display for several headers

Specifically, `CacheControl`, `Expect`, `Origin`, `Pragma`, `Prefer`, `PreferenceApplied`, `ReferrerPolicy`, `StrictTransportSecurity`.
hyperium · Jan 31, 2017 · d507577 · d507577
1 parent 0dcd5f5
commit d507577
Show file tree

Hide file tree

Showing 8 changed files with 49 additions and 0 deletions.
diff --git a/src/header/common/cache_control.rs b/src/header/common/cache_control.rs
@@ -66,6 +66,12 @@ impl Header for CacheControl {
 
 impl HeaderFormat for CacheControl {
     fn fmt_header(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        fmt::Display::fmt(self, f)
+    }
+}
+
+impl fmt::Display for CacheControl {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         fmt_comma_delimited(f, &self[..])
     }
 }

diff --git a/src/header/common/expect.rs b/src/header/common/expect.rs
@@ -57,6 +57,12 @@ impl Header for Expect {
 
 impl HeaderFormat for Expect {
     fn fmt_header(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        fmt::Display::fmt(self, f)
+    }
+}
+
+impl fmt::Display for Expect {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         f.write_str("100-continue")
     }
 }
diff --git a/src/header/common/origin.rs b/src/header/common/origin.rs
@@ -84,6 +84,12 @@ impl FromStr for Origin {
 
 impl HeaderFormat for Origin {
     fn fmt_header(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        fmt::Display::fmt(self, f)
+    }
+}
+
+impl fmt::Display for Origin {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         write!(f, "{}://{}", self.scheme, self.host)
     }
 }

diff --git a/src/header/common/pragma.rs b/src/header/common/pragma.rs
@@ -56,6 +56,12 @@ impl Header for Pragma {
 
 impl HeaderFormat for Pragma {
     fn fmt_header(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        fmt::Display::fmt(self, f)
+    }
+}
+
+impl fmt::Display for Pragma {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         f.write_str(match *self {
             Pragma::NoCache => "no-cache",
             Pragma::Ext(ref string) => &string[..],

diff --git a/src/header/common/prefer.rs b/src/header/common/prefer.rs
@@ -68,6 +68,12 @@ impl Header for Prefer {
 
 impl HeaderFormat for Prefer {
     fn fmt_header(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        fmt::Display::fmt(self, f)
+    }
+}
+
+impl fmt::Display for Prefer {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         fmt_comma_delimited(f, &self[..])
     }
 }

diff --git a/src/header/common/preference_applied.rs b/src/header/common/preference_applied.rs
@@ -65,6 +65,13 @@ impl Header for PreferenceApplied {
 
 impl HeaderFormat for PreferenceApplied {
     fn fmt_header(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        fmt::Display::fmt(self, f)
+    }
+}
+
+impl fmt::Display for PreferenceApplied {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        //TODO: format this without allocating a Vec and cloning contents
         let preferences: Vec<_> = self.0.iter().map(|pref| match pref {
             // The spec ignores parameters in `Preferences-Applied`
             &Preference::Extension(ref name, ref value, _) => Preference::Extension(

diff --git a/src/header/common/referrer_policy.rs b/src/header/common/referrer_policy.rs
@@ -82,6 +82,12 @@ impl Header for ReferrerPolicy {
 
 impl HeaderFormat for ReferrerPolicy {
     fn fmt_header(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        fmt::Display::fmt(self, f)
+    }
+}
+
+impl fmt::Display for ReferrerPolicy {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         use self::ReferrerPolicy::*;
         f.write_str(match *self {
             NoReferrer => "no-referrer",

diff --git a/src/header/common/strict_transport_security.rs b/src/header/common/strict_transport_security.rs
@@ -131,6 +131,12 @@ impl Header for StrictTransportSecurity {
 
 impl HeaderFormat for StrictTransportSecurity {
     fn fmt_header(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        fmt::Display::fmt(self, f)
+    }
+}
+
+impl fmt::Display for StrictTransportSecurity {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         if self.include_subdomains {
             write!(f, "max-age={}; includeSubdomains", self.max_age)
         } else {