Minor cleanups

Author: jtgeibel

src/adaptor.rs

@@ -153,7 +153,7 @@ impl RequestExt for ConduitRequest {
         let host = self
             .parts
             .headers()
-            .get("host")
+            .get(http::header::HOST)
             .map(|h| h.to_str().unwrap_or(""))
             .unwrap_or("");
         Host::Name(host)

src/lib.rs

@@ -1,5 +1,4 @@
 #![deny(clippy::all, missing_debug_implementations, rust_2018_idioms)]
-#![allow(clippy::needless_doctest_main, clippy::unknown_clippy_lints)] // using the tokio::main attribute
 
 //! A wrapper for integrating `hyper 0.13` with a `conduit 0.8` blocking application stack.
 //!
@@ -57,17 +56,3 @@ pub use service::{BlockingHandler, Service};
 
 type HyperResponse = hyper::Response<hyper::Body>;
 type ConduitResponse = conduit::Response<conduit::Body>;
-use crate::file_stream::FileStream;
-
-/// Turns a `ConduitResponse` into a `HyperResponse`
-fn conduit_into_hyper(response: ConduitResponse) -> HyperResponse {
-    use conduit::Body::*;
-
-    let (parts, body) = response.into_parts();
-    let body = match body {
-        Static(slice) => slice.into(),
-        Owned(vec) => vec.into(),
-        File(file) => FileStream::from_std(file).into_streamed_body(),
-    };
-    HyperResponse::from_parts(parts, body)
-}

src/service/blocking_handler.rs

@@ -1,6 +1,7 @@
 use crate::adaptor::{ConduitRequest, RequestInfo};
+use crate::file_stream::FileStream;
 use crate::service::ServiceError;
-use crate::{conduit_into_hyper, HyperResponse};
+use crate::{ConduitResponse, HyperResponse};
 
 use std::net::SocketAddr;
 use std::sync::{
@@ -60,6 +61,19 @@ impl<H: Handler> BlockingHandler<H> {
     }
 }
 
+/// Turns a `ConduitResponse` into a `HyperResponse`
+fn conduit_into_hyper(response: ConduitResponse) -> HyperResponse {
+    use conduit::Body::*;
+
+    let (parts, body) = response.into_parts();
+    let body = match body {
+        Static(slice) => slice.into(),
+        Owned(vec) => vec.into(),
+        File(file) => FileStream::from_std(file).into_streamed_body(),
+    };
+    HyperResponse::from_parts(parts, body)
+}
+
 /// Logs an error message and returns a generic status 500 response
 fn server_error_response(message: &str) -> HyperResponse {
     error!("Internal Server Error: {}", message);