actix/actix-web
1
0
Fork 0
mirror of https://github.com/fafhrd91/actix-web synced 2025-06-25 22:49:21 +02:00
Code Issues Releases Wiki Activity

nightly clippy warnings

Browse Source
This commit is contained in:
Nikolay Kim
2019-07-17 15:48:37 +06:00
parent 4092c7f326
commit 2a2d7f5768
34 changed files with 104 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
actix-files/src/lib.rs
View File

@ -107,7 +107,7 @@ impl Stream for ChunkedReadFile {
}
type DirectoryRenderer =
Fn(&Directory, &HttpRequest) -> Result<ServiceResponse, io::Error>;
dyn Fn(&Directory, &HttpRequest) -> Result<ServiceResponse, io::Error>;
/// A directory; responds with the generated directory listing.
#[derive(Debug)]
@ -211,7 +211,7 @@ fn directory_listing(
))
}
type MimeOverride = Fn(&mime::Name) -> DispositionType;
type MimeOverride = dyn Fn(&mime::Name) -> DispositionType;
/// Static files handling
///
@ -475,7 +475,7 @@ impl Service for FilesService {
Err(e) => ServiceResponse::from_err(e, req),
}))
}
Err(e) => return self.handle_err(e, req),
Err(e) => self.handle_err(e, req),
}
} else if self.show_index {
let dir = Directory::new(self.directory.clone(), path);
@ -483,7 +483,7 @@ impl Service for FilesService {
let x = (self.renderer)(&dir, &req);
match x {
Ok(resp) => Either::A(ok(resp)),
Err(e) => return Either::A(ok(ServiceResponse::from_err(e, req))),
Err(e) => Either::A(ok(ServiceResponse::from_err(e, req))),
}
} else {
Either::A(ok(ServiceResponse::from_err(
@ -857,7 +857,7 @@ mod tests {
#[test]
fn test_named_file_content_length_headers() {
use actix_web::body::{MessageBody, ResponseBody};
// use actix_web::body::{MessageBody, ResponseBody};
let mut srv = test::init_service(
App::new().service(Files::new("test", ".").index_file("tests/test.binary")),
@ -868,7 +868,7 @@ mod tests {
.uri("/t%65st/tests/test.binary")
.header(header::RANGE, "bytes=10-20")
.to_request();
let response = test::call_service(&mut srv, request);
let _response = test::call_service(&mut srv, request);
// let contentlength = response
// .headers()
@ -891,7 +891,7 @@ mod tests {
.uri("/t%65st/tests/test.binary")
// .no_default_headers()
.to_request();
let response = test::call_service(&mut srv, request);
let _response = test::call_service(&mut srv, request);
// let contentlength = response
// .headers()
@ -939,7 +939,7 @@ mod tests {
.method(Method::HEAD)
.uri("/t%65st/tests/test.binary")
.to_request();
let response = test::call_service(&mut srv, request);
let _response = test::call_service(&mut srv, request);
// TODO: fix check
// let contentlength = response

2
actix-files/src/range.rs
View File

@ -5,7 +5,7 @@ pub struct HttpRange {
pub length: u64,
}
static PREFIX: &'static str = "bytes=";
static PREFIX: &str = "bytes=";
const PREFIX_LEN: usize = 6;
impl HttpRange {