berkus
/
actix-web
mirror of https://github.com/fafhrd91/actix-web
1
0
Fork 0
Code Issues Releases Wiki Activity

fix AsyncResult::async vs AsyncResult::future

This commit is contained in:
Akos Vandra 2018-12-08 19:52:44 +01:00
parent de034e4dd0
commit 5bbb05ecd2
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/extractor.rs
View File

@ -715,26 +715,26 @@ impl<A: 'static, B: 'static, S: 'static> FromRequest<S> for Either<A,B> where A:
let b = B::from_request(req, &cfg.b).into().map(|b| Either::B(b)); let b = B::from_request(req, &cfg.b).into().map(|b| Either::B(b));
match &cfg.collision_strategy { match &cfg.collision_strategy {
EitherCollisionStrategy::PreferA => AsyncResult::async(Box::new(a.or_else(|_| b))), EitherCollisionStrategy::PreferA => AsyncResult::future(Box::new(a.or_else(|_| b))),
EitherCollisionStrategy::PreferB => AsyncResult::async(Box::new(b.or_else(|_| a))), EitherCollisionStrategy::PreferB => AsyncResult::future(Box::new(b.or_else(|_| a))),
EitherCollisionStrategy::FastestSuccessful => AsyncResult::async(Box::new(a.select2(b).then( |r| match r { EitherCollisionStrategy::FastestSuccessful => AsyncResult::future(Box::new(a.select2(b).then( |r| match r {
Ok(future::Either::A((ares, _b))) => AsyncResult::ok(ares), Ok(future::Either::A((ares, _b))) => AsyncResult::ok(ares),
Ok(future::Either::B((bres, _a))) => AsyncResult::ok(bres), Ok(future::Either::B((bres, _a))) => AsyncResult::ok(bres),
Err(future::Either::A((_aerr, b))) => AsyncResult::async(Box::new(b)), Err(future::Either::A((_aerr, b))) => AsyncResult::future(Box::new(b)),
Err(future::Either::B((_berr, a))) => AsyncResult::async(Box::new(a)) Err(future::Either::B((_berr, a))) => AsyncResult::future(Box::new(a))
}))), }))),
EitherCollisionStrategy::ErrorA => AsyncResult::async(Box::new(b.then(|r| match r { EitherCollisionStrategy::ErrorA => AsyncResult::future(Box::new(b.then(|r| match r {
Err(berr) => AsyncResult::async(Box::new(a)), Err(_berr) => AsyncResult::future(Box::new(a)),
Ok(b) => AsyncResult::async(Box::new(a.then( |r| match r { Ok(b) => AsyncResult::future(Box::new(a.then( |r| match r {
Ok(a) => Err(ErrorConflict("Both wings of either extractor completed")), Ok(_a) => Err(ErrorConflict("Both wings of either extractor completed")),
Err(arr) => Ok(b) Err(_arr) => Ok(b)
}))) })))
}))), }))),
EitherCollisionStrategy::ErrorB => AsyncResult::async(Box::new(a.then(|r| match r { EitherCollisionStrategy::ErrorB => AsyncResult::future(Box::new(a.then(|r| match r {
Err(aerr) => AsyncResult::async(Box::new(b)), Err(_aerr) => AsyncResult::future(Box::new(b)),
Ok(a) => AsyncResult::async(Box::new(b.then( |r| match r { Ok(a) => AsyncResult::future(Box::new(b.then( |r| match r {
Ok(b) => Err(ErrorConflict("Both wings of either extractor completed")), Ok(_b) => Err(ErrorConflict("Both wings of either extractor completed")),
Err(berr) => Ok(a) Err(_berr) => Ok(a)
}))) })))
}))), }))),
} }