diff --git a/actix-files/src/files.rs b/actix-files/src/files.rs index f00e3b49b..14d501b05 100644 --- a/actix-files/src/files.rs +++ b/actix-files/src/files.rs @@ -38,9 +38,7 @@ pub struct Files { renderer: Rc, mime_override: Option>, file_flags: named::Flags, - // FIXME: Should re-visit later. - #[allow(clippy::redundant_allocation)] - guards: Option>>, + guards: Option>, } impl Clone for Files { @@ -157,7 +155,7 @@ impl Files { /// Default behaviour allows GET and HEAD. #[inline] pub fn use_guards(mut self, guards: G) -> Self { - self.guards = Some(Rc::new(Box::new(guards))); + self.guards = Some(Rc::new(guards)); self } diff --git a/actix-files/src/lib.rs b/actix-files/src/lib.rs index e870ef79b..0bcf4057f 100644 --- a/actix-files/src/lib.rs +++ b/actix-files/src/lib.rs @@ -1,7 +1,6 @@ //! Static files support #![deny(rust_2018_idioms)] -#![allow(clippy::borrow_interior_mutable_const)] use std::io; @@ -29,9 +28,9 @@ pub use crate::named::NamedFile; pub use crate::range::HttpRange; pub use crate::service::FilesService; -pub(crate) use self::directory::{directory_listing, DirectoryRenderer}; -pub(crate) use self::error::FilesError; -pub(crate) use self::path_buf::PathBufWrap; +use self::directory::{directory_listing, DirectoryRenderer}; +use self::error::FilesError; +use self::path_buf::PathBufWrap; type HttpService = BoxService; type HttpNewService = BoxServiceFactory<(), ServiceRequest, ServiceResponse, Error, ()>; diff --git a/actix-files/src/named.rs b/actix-files/src/named.rs index 12da722d2..842bd1c9b 100644 --- a/actix-files/src/named.rs +++ b/actix-files/src/named.rs @@ -309,7 +309,7 @@ impl NamedFile { // check last modified let not_modified = if !none_match(etag.as_ref(), req) { true - } else if req.headers().contains_key(&header::IF_NONE_MATCH) { + } else if req.headers().contains_key(header::IF_NONE_MATCH) { false } else if let (Some(ref m), Some(header::IfModifiedSince(ref since))) = (last_modified, req.get_header()) @@ -350,7 +350,7 @@ impl NamedFile { let mut offset = 0; // check for range header - if let Some(ranges) = req.headers().get(&header::RANGE) { + if let Some(ranges) = req.headers().get(header::RANGE) { if let Ok(rangesheader) = ranges.to_str() { if let Ok(rangesvec) = HttpRange::parse(rangesheader, length) { length = rangesvec[0].length; diff --git a/actix-files/src/service.rs b/actix-files/src/service.rs index e3864bd36..9351e39d7 100644 --- a/actix-files/src/service.rs +++ b/actix-files/src/service.rs @@ -29,9 +29,7 @@ pub struct FilesService { pub(crate) renderer: Rc, pub(crate) mime_override: Option>, pub(crate) file_flags: named::Flags, - // FIXME: Should re-visit later. - #[allow(clippy::redundant_allocation)] - pub(crate) guards: Option>>, + pub(crate) guards: Option>, } impl FilesService {