actix/actix-extras
1
0
Fork 0
mirror of https://github.com/actix/actix-extras.git synced 2025-01-22 23:05:56 +01: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
Show Stats 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 v_htmlescape::escape as escape_html_entity;
use actix_service::{boxed::BoxedNewService, NewService, Service}; use actix_service::{boxed::BoxedNewService, NewService, Service};
use actix_web::dev::{CpuFuture, HttpServiceFactory, ResourceDef, ServiceConfig}; use actix_web::dev::{
use actix_web::error::{BlockingError, Error, ErrorInternalServerError}; CpuFuture, HttpServiceFactory, ResourceDef, ServiceConfig, ServiceFromRequest,
use actix_web::{
web, FromRequest, HttpRequest, HttpResponse, Responder, ServiceFromRequest,
ServiceRequest, ServiceResponse, ServiceRequest, ServiceResponse,
}; };
use actix_web::error::{BlockingError, Error, ErrorInternalServerError};
use actix_web::{web, FromRequest, HttpRequest, HttpResponse, Responder};
use futures::future::{ok, FutureResult}; use futures::future::{ok, FutureResult};
mod config; mod config;
@ -34,7 +34,8 @@ pub use crate::config::{DefaultConfig, StaticFileConfig};
pub use crate::named::NamedFile; pub use crate::named::NamedFile;
pub use crate::range::HttpRange; 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). /// 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 /// 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> { impl<P, C: StaticFileConfig + 'static> NewService for Files<P, C> {
type Request = ServiceRequest<P>; type Request = ServiceRequest<P>;
type Response = ServiceResponse; type Response = ServiceResponse;
type Error = (); type Error = Error;
type Service = FilesService<P, C>; type Service = FilesService<P, C>;
type InitError = (); type InitError = ();
type Future = FutureResult<Self::Service, Self::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> { impl<P, C: StaticFileConfig> Service for FilesService<P, C> {
type Request = ServiceRequest<P>; type Request = ServiceRequest<P>;
type Response = ServiceResponse; type Response = ServiceResponse;
type Error = (); type Error = Error;
type Future = FutureResult<Self::Response, Self::Error>; type Future = FutureResult<Self::Response, Self::Error>;
fn poll_ready(&mut self) -> Poll<(), Self::Error> { fn poll_ready(&mut self) -> Poll<(), Self::Error> {

3
actix-session/src/cookie.rs
View File

@ -19,8 +19,9 @@ use std::collections::HashMap;
use std::rc::Rc; use std::rc::Rc;
use actix_service::{Service, Transform}; use actix_service::{Service, Transform};
use actix_web::dev::{ServiceRequest, ServiceResponse};
use actix_web::http::{header::SET_COOKIE, HeaderValue}; use actix_web::http::{header::SET_COOKIE, HeaderValue};
use actix_web::{Error, HttpMessage, ResponseError, ServiceRequest, ServiceResponse}; use actix_web::{Error, HttpMessage, ResponseError};
use cookie::{Cookie, CookieJar, Key, SameSite}; use cookie::{Cookie, CookieJar, Key, SameSite};
use derive_more::{Display, From}; use derive_more::{Display, From};
use futures::future::{ok, Future, FutureResult}; use futures::future::{ok, Future, FutureResult};

2
actix-session/src/lib.rs
View File

@ -45,8 +45,8 @@
use std::cell::RefCell; use std::cell::RefCell;
use std::rc::Rc; use std::rc::Rc;
use actix_web::dev::{ServiceFromRequest, ServiceRequest, ServiceResponse};
use actix_web::{Error, FromRequest, HttpMessage}; use actix_web::{Error, FromRequest, HttpMessage};
use actix_web::{ServiceFromRequest, ServiceRequest, ServiceResponse};
use hashbrown::HashMap; use hashbrown::HashMap;
use serde::de::DeserializeOwned; use serde::de::DeserializeOwned;
use serde::Serialize; use serde::Serialize;

8
src/extract/mod.rs
View File

@ -40,7 +40,7 @@ pub trait FromRequest<P>: Sized {
/// ///
/// ```rust /// ```rust
/// # #[macro_use] extern crate serde_derive; /// # #[macro_use] extern crate serde_derive;
/// use actix_web::{web, App, Error, FromRequest, ServiceFromRequest}; /// use actix_web::{web, dev, App, Error, FromRequest};
/// use actix_web::error::ErrorBadRequest; /// use actix_web::error::ErrorBadRequest;
/// use rand; /// use rand;
/// ///
@ -53,7 +53,7 @@ pub trait FromRequest<P>: Sized {
/// type Error = Error; /// type Error = Error;
/// type Future = Result<Self, Self::Error>; /// type Future = Result<Self, Self::Error>;
/// ///
/// fn from_request(req: &mut ServiceFromRequest<P>) -> Self::Future { /// fn from_request(req: &mut dev::ServiceFromRequest<P>) -> Self::Future {
/// if rand::random() { /// if rand::random() {
/// Ok(Thing { name: "thingy".into() }) /// Ok(Thing { name: "thingy".into() })
/// } else { /// } else {
@ -107,7 +107,7 @@ where
/// ///
/// ```rust /// ```rust
/// # #[macro_use] extern crate serde_derive; /// # #[macro_use] extern crate serde_derive;
/// use actix_web::{web, App, Result, Error, FromRequest, ServiceFromRequest}; /// use actix_web::{web, dev, App, Result, Error, FromRequest};
/// use actix_web::error::ErrorBadRequest; /// use actix_web::error::ErrorBadRequest;
/// use rand; /// use rand;
/// ///
@ -120,7 +120,7 @@ where
/// type Error = Error; /// type Error = Error;
/// type Future = Result<Thing, Error>; /// type Future = Result<Thing, Error>;
/// ///
/// fn from_request(req: &mut ServiceFromRequest<P>) -> Self::Future { /// fn from_request(req: &mut dev::ServiceFromRequest<P>) -> Self::Future {
/// if rand::random() { /// if rand::random() {
/// Ok(Thing { name: "thingy".into() }) /// Ok(Thing { name: "thingy".into() })
/// } else { /// } else {