remove clippy allows

This commit is contained in:
Rob Ede 2020-09-16 00:12:16 +01:00
parent db55079c25
commit 3046980540
No known key found for this signature in database
GPG Key ID: C2A3B36E841A91E6
4 changed files with 8 additions and 13 deletions

View File

@ -38,9 +38,7 @@ pub struct Files {
renderer: Rc<DirectoryRenderer>,
mime_override: Option<Rc<MimeOverride>>,
file_flags: named::Flags,
// FIXME: Should re-visit later.
#[allow(clippy::redundant_allocation)]
guards: Option<Rc<Box<dyn Guard>>>,
guards: Option<Rc<dyn Guard>>,
}
impl Clone for Files {
@ -157,7 +155,7 @@ impl Files {
/// Default behaviour allows GET and HEAD.
#[inline]
pub fn use_guards<G: Guard + 'static>(mut self, guards: G) -> Self {
self.guards = Some(Rc::new(Box::new(guards)));
self.guards = Some(Rc::new(guards));
self
}

View File

@ -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<ServiceRequest, ServiceResponse, Error>;
type HttpNewService = BoxServiceFactory<(), ServiceRequest, ServiceResponse, Error, ()>;

View File

@ -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;

View File

@ -29,9 +29,7 @@ pub struct FilesService {
pub(crate) renderer: Rc<DirectoryRenderer>,
pub(crate) mime_override: Option<Rc<MimeOverride>>,
pub(crate) file_flags: named::Flags,
// FIXME: Should re-visit later.
#[allow(clippy::redundant_allocation)]
pub(crate) guards: Option<Rc<Box<dyn Guard>>>,
pub(crate) guards: Option<Rc<dyn Guard>>,
}
impl FilesService {