Merge pull request #304 from brightly-salty/fix-formatting

Fix formatting for StatusCode

Author: joshtriplett

src/cache/cache_control/cache_directive.rs

@@ -47,26 +47,29 @@ impl CacheDirective {
     /// Check whether this directive is valid in an HTTP request.
     pub fn valid_in_req(&self) -> bool {
         use CacheDirective::*;
-        matches!(self,
-            MaxAge(_) | MaxStale(_) | MinFresh(_) | NoCache | NoStore | NoTransform
-            | OnlyIfCached)
+        matches!(
+            self,
+            MaxAge(_) | MaxStale(_) | MinFresh(_) | NoCache | NoStore | NoTransform | OnlyIfCached
+        )
     }
 
     /// Check whether this directive is valid in an HTTP response.
     pub fn valid_in_res(&self) -> bool {
         use CacheDirective::*;
-        matches!(self,
+        matches!(
+            self,
             MustRevalidate
-            | NoCache
-            | NoStore
-            | NoTransform
-            | Public
-            | Private
-            | ProxyRevalidate
-            | MaxAge(_)
-            | SMaxAge(_)
-            | StaleIfError(_)
-            | StaleWhileRevalidate(_))
+                | NoCache
+                | NoStore
+                | NoTransform
+                | Public
+                | Private
+                | ProxyRevalidate
+                | MaxAge(_)
+                | SMaxAge(_)
+                | StaleIfError(_)
+                | StaleWhileRevalidate(_)
+        )
     }
 
     /// Create an instance from a string slice.

src/proxies/forwarded.rs

@@ -545,7 +545,7 @@ mod tests {
         assert_eq!(forwarded.forwarded_for(), vec!["client.com"]);
         assert_eq!(forwarded.host(), Some("host.com"));
         assert_eq!(forwarded.proto(), Some("https"));
-        assert!(matches!(forwarded, Forwarded{..}));
+        assert!(matches!(forwarded, Forwarded { .. }));
         Ok(())
     }
 
@@ -644,7 +644,7 @@ mod tests {
         assert_eq!(forwarded.forwarded_for(), vec!["client"]);
         assert_eq!(forwarded.host(), Some("example.com"));
         assert_eq!(forwarded.proto(), Some("https"));
-        assert!(matches!(forwarded, Forwarded{..}));
+        assert!(matches!(forwarded, Forwarded { .. }));
         Ok(())
     }
 

src/status_code.rs

@@ -1,13 +1,13 @@
 use serde::de::{Error as DeError, Unexpected, Visitor};
 use serde::{Deserialize, Deserializer, Serialize, Serializer};
-use std::fmt::{self, Display};
+use std::fmt::{self, Debug, Display};
 
 /// HTTP response status codes.
 ///
 /// As defined by [rfc7231 section 6](https://tools.ietf.org/html/rfc7231#section-6).
 /// [Read more](https://developer.mozilla.org/en-US/docs/Web/HTTP/Status)
 #[repr(u16)]
-#[derive(Debug, Clone, Copy, Eq, PartialEq, Hash)]
+#[derive(Clone, Copy, Eq, PartialEq, Hash)]
 pub enum StatusCode {
     /// 100 Continue
     ///
@@ -704,9 +704,15 @@ impl PartialEq<u16> for StatusCode {
     }
 }
 
+impl Debug for StatusCode {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(f, "{}: {}", *self as u16, self.canonical_reason())
+    }
+}
+
 impl Display for StatusCode {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(f, "{}", *self as u16)
+        write!(f, "{}: {}", *self as u16, self.canonical_reason())
     }
 }