actix/actix-extras
1
0
Fork 0
mirror of https://github.com/actix/actix-extras.git synced 2025-06-27 10:39:03 +02:00
Code Issues Releases Wiki Activity

update to alpha6

Browse Source
This commit is contained in:
Nikolay Kim
2019-04-14 10:30:37 -07:00
parent 345e67cd13
commit cb682b08e4
2 changed files with 14 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/session.rs
View File

@ -90,18 +90,14 @@ impl RedisSession {
}
}
impl<S, P, B> Transform<S> for RedisSession
impl<S, B> Transform<S> for RedisSession
where
S: Service<
Request = ServiceRequest<P>,
Response = ServiceResponse<B>,
Error = Error,
> + 'static,
S: Service<Request = ServiceRequest, Response = ServiceResponse<B>, Error = Error>
+ 'static,
S::Future: 'static,
P: 'static,
B: 'static,
{
type Request = ServiceRequest<P>;
type Request = ServiceRequest;
type Response = ServiceResponse<B>;
type Error = S::Error;
type InitError = ();
@ -122,18 +118,14 @@ pub struct RedisSessionMiddleware<S: 'static> {
inner: Rc<Inner>,
}
impl<S, P, B> Service for RedisSessionMiddleware<S>
impl<S, B> Service for RedisSessionMiddleware<S>
where
S: Service<
Request = ServiceRequest<P>,
Response = ServiceResponse<B>,
Error = Error,
> + 'static,
S: Service<Request = ServiceRequest, Response = ServiceResponse<B>, Error = Error>
+ 'static,
S::Future: 'static,
P: 'static,
B: 'static,
{
type Request = ServiceRequest<P>;
type Request = ServiceRequest;
type Response = ServiceResponse<B>;
type Error = Error;
type Future = Box<Future<Item = Self::Response, Error = Self::Error>>;
@ -142,7 +134,7 @@ where
self.service.poll_ready()
}
fn call(&mut self, mut req: ServiceRequest<P>) -> Self::Future {
fn call(&mut self, mut req: ServiceRequest) -> Self::Future {
let mut srv = self.service.clone();
let inner = self.inner.clone();
@ -178,9 +170,9 @@ struct Inner {
}
impl Inner {
fn load<P>(
fn load(
&self,
req: &ServiceRequest<P>,
req: &ServiceRequest,
) -> impl Future<Item = Option<(HashMap<String, String>, String)>, Error = Error>
{
if let Ok(cookies) = req.cookies() {