From 247869f2477f90645452ac28dbb5fd249ec795cc Mon Sep 17 00:00:00 2001 From: Jose Quintana Date: Mon, 27 Sep 2021 21:27:56 +0200 Subject: [PATCH] refactor: fix rust edition idioms --- src/bin/server.rs | 11 ++++++----- src/error_page.rs | 2 +- src/gzip.rs | 2 +- src/lib.rs | 9 +++------ src/logger.rs | 2 +- src/staticfile_middleware/cache.rs | 5 ++--- src/staticfile_middleware/guess_content_type.rs | 3 +-- src/staticfile_middleware/http_to_https_redirect.rs | 2 +- src/staticfile_middleware/modify_with.rs | 2 +- src/staticfile_middleware/prefix.rs | 2 +- src/staticfile_middleware/rewrite.rs | 2 +- src/staticfile_middleware/staticfile.rs | 8 ++++---- 12 files changed, 23 insertions(+), 27 deletions(-) diff --git a/src/bin/server.rs b/src/bin/server.rs index f43a938..b57fd23 100644 --- a/src/bin/server.rs +++ b/src/bin/server.rs @@ -1,9 +1,10 @@ +#![deny(warnings)] +#![deny(rust_2018_idioms)] + #[cfg(all(target_env = "musl", target_pointer_width = "64"))] #[global_allocator] static ALLOC: jemallocator::Jemalloc = jemallocator::Jemalloc; -extern crate static_web_server; - use static_web_server::{server, Options}; use structopt::StructOpt; @@ -13,9 +14,9 @@ fn main() { #[cfg(test)] mod test { - extern crate hyper; - extern crate iron_test; - extern crate tempfile; + use hyper; + use iron_test; + use tempfile; use super::*; use static_web_server::config::Options; diff --git a/src/error_page.rs b/src/error_page.rs index c2e19ac..09f3594 100644 --- a/src/error_page.rs +++ b/src/error_page.rs @@ -33,7 +33,7 @@ impl ErrorPage { } impl AfterMiddleware for ErrorPage { - fn after(&self, req: &mut Request, mut resp: Response) -> IronResult { + fn after(&self, req: &mut Request<'_, '_>, mut resp: Response) -> IronResult { let content_type = "text/html" .parse::() .expect("Unable to create a default content type header"); diff --git a/src/gzip.rs b/src/gzip.rs index ac06955..82c6466 100644 --- a/src/gzip.rs +++ b/src/gzip.rs @@ -9,7 +9,7 @@ use crate::staticfile_middleware::helpers; pub struct GzipMiddleware; impl AfterMiddleware for GzipMiddleware { - fn after(&self, req: &mut Request, mut resp: Response) -> IronResult { + fn after(&self, req: &mut Request<'_, '_>, mut resp: Response) -> IronResult { // Skip Gzip compression for HEAD requests if req.method == iron::method::Head { return Ok(resp); diff --git a/src/lib.rs b/src/lib.rs index ee21821..e700e11 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -1,12 +1,9 @@ +#![deny(warnings)] +#![deny(rust_2018_idioms)] + #[macro_use] extern crate log; -extern crate iron; -extern crate mime; -extern crate mime_guess; -extern crate time; -extern crate url; - pub mod config; pub mod error_page; pub mod gzip; diff --git a/src/logger.rs b/src/logger.rs index fb6e3dc..db2ba32 100644 --- a/src/logger.rs +++ b/src/logger.rs @@ -46,7 +46,7 @@ pub fn log_server(msg: &str) { pub struct Logger; impl AfterMiddleware for Logger { - fn after(&self, req: &mut Request, res: Response) -> IronResult { + fn after(&self, req: &mut Request<'_, '_>, res: Response) -> IronResult { info!( "Request [{}] {} - {}", req.method, diff --git a/src/staticfile_middleware/cache.rs b/src/staticfile_middleware/cache.rs index 78375bc..9de21e3 100644 --- a/src/staticfile_middleware/cache.rs +++ b/src/staticfile_middleware/cache.rs @@ -1,11 +1,10 @@ -use std::time::Duration; -use std::{cmp, u32}; - use iron::headers::{CacheControl, CacheDirective}; use iron::modifier::Modifier; use iron::modifiers::Header; use iron::prelude::*; use iron::status; +use std::time::Duration; +use std::{cmp, u32}; /// Sets the Cache-Control header for successful responses. #[derive(Debug, Copy, Clone)] diff --git a/src/staticfile_middleware/guess_content_type.rs b/src/staticfile_middleware/guess_content_type.rs index 2a4ad50..d47cbba 100644 --- a/src/staticfile_middleware/guess_content_type.rs +++ b/src/staticfile_middleware/guess_content_type.rs @@ -1,7 +1,6 @@ use iron::headers::ContentType; use iron::prelude::*; use iron::AfterMiddleware; - use mime::Mime; /// Attempts to guess the content type of the response based on the @@ -26,7 +25,7 @@ impl Default for GuessContentType { } impl AfterMiddleware for GuessContentType { - fn after(&self, req: &mut Request, mut res: Response) -> IronResult { + fn after(&self, req: &mut Request<'_, '_>, mut res: Response) -> IronResult { match res.headers.get::() { Some(_) => {} None => { diff --git a/src/staticfile_middleware/http_to_https_redirect.rs b/src/staticfile_middleware/http_to_https_redirect.rs index 61e8022..409d9bb 100644 --- a/src/staticfile_middleware/http_to_https_redirect.rs +++ b/src/staticfile_middleware/http_to_https_redirect.rs @@ -33,7 +33,7 @@ impl HttpToHttpsRedirect { } impl iron::Handler for HttpToHttpsRedirect { - fn handle(&self, req: &mut Request) -> IronResult { + fn handle(&self, req: &mut Request<'_, '_>) -> IronResult { let mut url: url::Url = req.url.clone().into(); url.set_scheme("https") diff --git a/src/staticfile_middleware/modify_with.rs b/src/staticfile_middleware/modify_with.rs index 04ba9b1..a9449fb 100644 --- a/src/staticfile_middleware/modify_with.rs +++ b/src/staticfile_middleware/modify_with.rs @@ -17,7 +17,7 @@ impl AfterMiddleware for ModifyWith where M: Clone + Modifier + Send + Sync + 'static, { - fn after(&self, _req: &mut Request, mut res: Response) -> IronResult { + fn after(&self, _req: &mut Request<'_, '_>, mut res: Response) -> IronResult { self.modifier.clone().modify(&mut res); Ok(res) } diff --git a/src/staticfile_middleware/prefix.rs b/src/staticfile_middleware/prefix.rs index ac7d9ae..9440ef2 100644 --- a/src/staticfile_middleware/prefix.rs +++ b/src/staticfile_middleware/prefix.rs @@ -35,7 +35,7 @@ impl AfterMiddleware for Prefix where M: Clone + Modifier + Send + Sync + 'static, { - fn after(&self, req: &mut Request, mut res: Response) -> IronResult { + fn after(&self, req: &mut Request<'_, '_>, mut res: Response) -> IronResult { if self.prefix_matches(&req.url.path()) { self.modifier.clone().modify(&mut res); } diff --git a/src/staticfile_middleware/rewrite.rs b/src/staticfile_middleware/rewrite.rs index 681173f..b35016b 100644 --- a/src/staticfile_middleware/rewrite.rs +++ b/src/staticfile_middleware/rewrite.rs @@ -15,7 +15,7 @@ impl Rewrite { } impl iron::BeforeMiddleware for Rewrite { - fn before(&self, req: &mut Request) -> IronResult<()> { + fn before(&self, req: &mut Request<'_, '_>) -> IronResult<()> { let should_rewrite = { let request_path = req.url.path(); self.from diff --git a/src/staticfile_middleware/staticfile.rs b/src/staticfile_middleware/staticfile.rs index 083f925..eaeb598 100644 --- a/src/staticfile_middleware/staticfile.rs +++ b/src/staticfile_middleware/staticfile.rs @@ -82,7 +82,7 @@ impl Staticfile { } impl Handler for Staticfile { - fn handle(&self, req: &mut Request) -> IronResult { + fn handle(&self, req: &mut Request<'_, '_>) -> IronResult { // Accept only HEAD and GET methods if !(req.method == Method::Head || req.method == Method::Get) { return Ok(Response::with(status::MethodNotAllowed)); @@ -318,9 +318,9 @@ fn parse_last_modified(modified: SystemTime) -> Result