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

update service request/response location

Browse Source
This commit is contained in:
Nikolay Kim
2019-03-10 16:39:46 -07:00
parent 4d96abb639
commit 0f0d6b65ca
4 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -16,12 +16,12 @@ use percent_encoding::{utf8_percent_encode, DEFAULT_ENCODE_SET};
use v_htmlescape::escape as escape_html_entity;
use actix_service::{boxed::BoxedNewService, NewService, Service};
use actix_web::dev::{CpuFuture, HttpServiceFactory, ResourceDef, ServiceConfig};
use actix_web::error::{BlockingError, Error, ErrorInternalServerError};
use actix_web::{
web, FromRequest, HttpRequest, HttpResponse, Responder, ServiceFromRequest,
use actix_web::dev::{
CpuFuture, HttpServiceFactory, ResourceDef, ServiceConfig, ServiceFromRequest,
ServiceRequest, ServiceResponse,
};
use actix_web::error::{BlockingError, Error, ErrorInternalServerError};
use actix_web::{web, FromRequest, HttpRequest, HttpResponse, Responder};
use futures::future::{ok, FutureResult};
mod config;
@ -34,7 +34,8 @@ pub use crate::config::{DefaultConfig, StaticFileConfig};
pub use crate::named::NamedFile;
pub use crate::range::HttpRange;
type HttpNewService<P> = BoxedNewService<(), ServiceRequest<P>, ServiceResponse, (), ()>;
type HttpNewService<P> =
BoxedNewService<(), ServiceRequest<P>, ServiceResponse, Error, ()>;
/// Return the MIME type associated with a filename extension (case-insensitive).
/// If `ext` is empty or no associated type for the extension was found, returns
@ -319,7 +320,7 @@ where
impl<P, C: StaticFileConfig + 'static> NewService for Files<P, C> {
type Request = ServiceRequest<P>;
type Response = ServiceResponse;
type Error = ();
type Error = Error;
type Service = FilesService<P, C>;
type InitError = ();
type Future = FutureResult<Self::Service, Self::InitError>;
@ -352,7 +353,7 @@ pub struct FilesService<S, C = DefaultConfig> {
impl<P, C: StaticFileConfig> Service for FilesService<P, C> {
type Request = ServiceRequest<P>;
type Response = ServiceResponse;
type Error = ();
type Error = Error;
type Future = FutureResult<Self::Response, Self::Error>;
fn poll_ready(&mut self) -> Poll<(), Self::Error> {