2018-09-04 12:07:13 -07:00
|
|
|
use std::marker::PhantomData;
|
|
|
|
|
|
|
|
use futures::{Future, Poll};
|
2018-09-11 09:30:22 -07:00
|
|
|
|
|
|
|
use super::Service;
|
2018-09-04 12:07:13 -07:00
|
|
|
|
2018-09-12 13:34:53 -07:00
|
|
|
/// Service for the `from_err` combinator, changing the error type of a service.
|
|
|
|
///
|
|
|
|
/// This is created by the `ServiceExt::from_err` method.
|
2018-09-04 12:07:13 -07:00
|
|
|
pub struct FromErr<A, E>
|
|
|
|
where
|
|
|
|
A: Service,
|
|
|
|
{
|
|
|
|
service: A,
|
|
|
|
f: PhantomData<E>,
|
|
|
|
}
|
|
|
|
|
|
|
|
impl<A: Service, E: From<A::Error>> FromErr<A, E> {
|
|
|
|
pub(crate) fn new(service: A) -> Self {
|
|
|
|
FromErr {
|
|
|
|
service,
|
|
|
|
f: PhantomData,
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-09-05 19:27:52 -07:00
|
|
|
impl<A, E> Clone for FromErr<A, E>
|
|
|
|
where
|
|
|
|
A: Service + Clone,
|
|
|
|
E: From<A::Error>,
|
|
|
|
{
|
|
|
|
fn clone(&self) -> Self {
|
|
|
|
FromErr {
|
|
|
|
service: self.service.clone(),
|
|
|
|
f: PhantomData,
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-09-04 12:07:13 -07:00
|
|
|
impl<A, E> Service for FromErr<A, E>
|
|
|
|
where
|
|
|
|
A: Service,
|
|
|
|
E: From<A::Error>,
|
|
|
|
{
|
|
|
|
type Request = A::Request;
|
|
|
|
type Response = A::Response;
|
|
|
|
type Error = E;
|
|
|
|
type Future = FromErrFuture<A, E>;
|
|
|
|
|
|
|
|
fn poll_ready(&mut self) -> Poll<(), E> {
|
|
|
|
Ok(self.service.poll_ready().map_err(E::from)?)
|
|
|
|
}
|
|
|
|
|
|
|
|
fn call(&mut self, req: Self::Request) -> Self::Future {
|
|
|
|
FromErrFuture {
|
|
|
|
fut: self.service.call(req),
|
|
|
|
f: PhantomData,
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
pub struct FromErrFuture<A: Service, E> {
|
|
|
|
fut: A::Future,
|
|
|
|
f: PhantomData<E>,
|
|
|
|
}
|
|
|
|
|
|
|
|
impl<A, E> Future for FromErrFuture<A, E>
|
|
|
|
where
|
|
|
|
A: Service,
|
|
|
|
E: From<A::Error>,
|
|
|
|
{
|
|
|
|
type Item = A::Response;
|
|
|
|
type Error = E;
|
|
|
|
|
|
|
|
fn poll(&mut self) -> Poll<Self::Item, Self::Error> {
|
|
|
|
self.fut.poll().map_err(E::from)
|
|
|
|
}
|
|
|
|
}
|
2018-09-12 13:34:53 -07:00
|
|
|
|
|
|
|
#[cfg(test)]
|
|
|
|
mod tests {
|
|
|
|
use futures::future::{err, FutureResult};
|
|
|
|
|
|
|
|
use super::*;
|
|
|
|
use service::{Service, ServiceExt};
|
|
|
|
|
|
|
|
struct Srv;
|
|
|
|
impl Service for Srv {
|
|
|
|
type Request = ();
|
|
|
|
type Response = ();
|
|
|
|
type Error = ();
|
|
|
|
type Future = FutureResult<(), ()>;
|
|
|
|
|
|
|
|
fn poll_ready(&mut self) -> Poll<(), Self::Error> {
|
|
|
|
Err(())
|
|
|
|
}
|
|
|
|
|
|
|
|
fn call(&mut self, _: ()) -> Self::Future {
|
|
|
|
err(())
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
#[derive(Debug, PartialEq)]
|
|
|
|
struct Error;
|
|
|
|
|
|
|
|
impl From<()> for Error {
|
|
|
|
fn from(_: ()) -> Self {
|
|
|
|
Error
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn test_poll_ready() {
|
|
|
|
let mut srv = Srv.from_err::<Error>();
|
|
|
|
let res = srv.poll_ready();
|
|
|
|
assert!(res.is_err());
|
|
|
|
assert_eq!(res.err().unwrap(), Error);
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn test_call() {
|
|
|
|
let mut srv = Srv.from_err::<Error>();
|
|
|
|
let res = srv.call(()).poll();
|
|
|
|
assert!(res.is_err());
|
|
|
|
assert_eq!(res.err().unwrap(), Error);
|
|
|
|
}
|
|
|
|
}
|