From 84e7fc8ef7c0e4114f74606bbea5537b06ba66ef Mon Sep 17 00:00:00 2001
From: Chris Hulbert <chris.hulbert@gmail.com>
Date: Sat, 20 Feb 2021 16:22:13 +1100
Subject: [PATCH] Newer deps versions

---
 Cargo.toml     | 10 +++++-----
 src/lib.rs     | 10 ++++------
 src/request.rs |  6 +++---
 3 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 603991e..1392d7c 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -12,12 +12,12 @@ categories = ["web-programming"]
 travis-ci = { repository = "steveklabnik/simple-server" }
 
 [dependencies]
-http = "0.1.0"
-httparse = "1.2.3"
-log = "0.3"
+http = "0"
+httparse = "1"
+log = "0"
 num_cpus = "1"
-scoped_threadpool = "0.1.7"
+scoped_threadpool = "0"
 time = "0.1"
 
 [dev-dependencies]
-env_logger = "0.3"
+env_logger = "0"
diff --git a/src/lib.rs b/src/lib.rs
index 383ae63..2d49044 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -59,7 +59,7 @@ pub use error::Error;
 pub type ResponseResult = Result<Response<Vec<u8>>, Error>;
 
 pub type Handler =
-    Box<Fn(Request<Vec<u8>>, ResponseBuilder) -> ResponseResult + 'static + Send + Sync>;
+    Box<dyn Fn(Request<Vec<u8>>, ResponseBuilder) -> ResponseResult + 'static + Send + Sync>;
 
 /// A web server.
 ///
@@ -375,7 +375,7 @@ impl Server {
 
             if traversal_attempt {
                 // GET OUT
-                response_builder.status(StatusCode::NOT_FOUND);
+                response_builder = response_builder.status(StatusCode::NOT_FOUND);
 
                 let response = response_builder
                     .body("<h1>404</h1><p>Not found!<p>".as_bytes())
@@ -404,10 +404,8 @@ impl Server {
         match (self.handler)(request, response_builder) {
             Ok(response) => Ok(write_response(response, stream)?),
             Err(_) => {
-                let mut response_builder = Response::builder();
-                response_builder.status(StatusCode::INTERNAL_SERVER_ERROR);
-
-                let response = response_builder
+                let response = Response::builder()
+                    .status(StatusCode::INTERNAL_SERVER_ERROR)
                     .body("<h1>500</h1><p>Internal Server Error!<p>".as_bytes())
                     .unwrap();
 
diff --git a/src/request.rs b/src/request.rs
index 840be4a..d030b1f 100644
--- a/src/request.rs
+++ b/src/request.rs
@@ -29,7 +29,7 @@ pub fn read<S: Read>(stream: &mut S, timeout: Option<Duration>) -> Result<Reques
                 match parsing::try_parse_request(mem::replace(&mut buffer, vec![]))? {
                     parsing::ParseResult::Complete(r) => break r,
                     parsing::ParseResult::Partial(b) => {
-                        mem::replace(&mut buffer, b);
+                        let _old = mem::replace(&mut buffer, b);
                         continue;
                     }
                 }
@@ -57,10 +57,10 @@ pub fn read<S: Read>(stream: &mut S, timeout: Option<Duration>) -> Result<Reques
 fn build_request(mut req: parsing::Request) -> Result<Request<Vec<u8>>, Error> {
     let mut http_req = Request::builder();
 
-    http_req.method(req.method());
+    http_req = http_req.method(req.method());
 
     for header in req.headers() {
-        http_req.header(header.name, header.value);
+        http_req = http_req.header(header.name, header.value);
     }
 
     let mut request = http_req.body(req.split_body())?;