From cbc6faf82520516ba0bdbde01d739ea83a98f664 Mon Sep 17 00:00:00 2001
From: brightly-salty <code@brightlysalty.33mail.com>
Date: Sat, 19 Dec 2020 17:33:30 -0600
Subject: [PATCH] Make trailers module a submodule of transfer

---
 src/cache/cache_control/cache_directive.rs | 31 ++++++++++++----------
 src/lib.rs                                 |  3 +--
 src/proxies/forwarded.rs                   |  4 +--
 src/request.rs                             |  2 +-
 src/response.rs                            |  2 +-
 src/transfer/mod.rs                        |  2 ++
 src/{ => transfer}/trailers.rs             |  0
 7 files changed, 24 insertions(+), 20 deletions(-)
 rename src/{ => transfer}/trailers.rs (100%)

diff --git a/src/cache/cache_control/cache_directive.rs b/src/cache/cache_control/cache_directive.rs
index 859d9c0c..7ca8ce9d 100644
--- a/src/cache/cache_control/cache_directive.rs
+++ b/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.
diff --git a/src/lib.rs b/src/lib.rs
index 3123d7cf..4e6071fe 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -152,7 +152,7 @@ pub use status_code::StatusCode;
 pub use version::Version;
 
 #[doc(inline)]
-pub use trailers::Trailers;
+pub use transfer::trailers::Trailers;
 
 #[doc(inline)]
 pub use mime::Mime;
@@ -167,7 +167,6 @@ pub use crate::url::Url;
 pub use crate::cookies::Cookie;
 
 pub mod security;
-pub mod trailers;
 
 #[cfg(feature = "hyperium_http")]
 mod hyperium_http;
diff --git a/src/proxies/forwarded.rs b/src/proxies/forwarded.rs
index 79b95442..abf21391 100644
--- a/src/proxies/forwarded.rs
+++ b/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(())
     }
 
diff --git a/src/request.rs b/src/request.rs
index 2296cc32..e52905dd 100644
--- a/src/request.rs
+++ b/src/request.rs
@@ -12,7 +12,7 @@ use crate::headers::{
     CONTENT_TYPE,
 };
 use crate::mime::Mime;
-use crate::trailers::{self, Trailers};
+use crate::transfer::{trailers, Trailers};
 use crate::{Body, Extensions, Method, StatusCode, Url, Version};
 
 pin_project_lite::pin_project! {
diff --git a/src/response.rs b/src/response.rs
index 766dacba..884dd26a 100644
--- a/src/response.rs
+++ b/src/response.rs
@@ -13,7 +13,7 @@ use crate::headers::{
     CONTENT_TYPE,
 };
 use crate::mime::Mime;
-use crate::trailers::{self, Trailers};
+use crate::transfer::{trailers, Trailers};
 use crate::upgrade;
 use crate::{Body, Extensions, StatusCode, Version};
 
diff --git a/src/transfer/mod.rs b/src/transfer/mod.rs
index 38cc6753..7ba59164 100644
--- a/src/transfer/mod.rs
+++ b/src/transfer/mod.rs
@@ -5,9 +5,11 @@
 mod encoding;
 mod encoding_proposal;
 mod te;
+pub mod trailers;
 mod transfer_encoding;
 
 pub use encoding::Encoding;
 pub use encoding_proposal::EncodingProposal;
 pub use te::TE;
+pub use trailers::Trailers;
 pub use transfer_encoding::TransferEncoding;
diff --git a/src/trailers.rs b/src/transfer/trailers.rs
similarity index 100%
rename from src/trailers.rs
rename to src/transfer/trailers.rs