From 5b74c79cf9430ba02fb07befd618b30987cb23b8 Mon Sep 17 00:00:00 2001
From: Nikolay Kim <fafhrd91@gmail.com>
Date: Tue, 19 Nov 2019 06:51:43 +0600
Subject: [PATCH] Simplify transform trait, remove map_init_err

---
 actix-service/src/lib.rs       |  2 +-
 actix-service/src/transform.rs | 99 ----------------------------------
 2 files changed, 1 insertion(+), 100 deletions(-)

diff --git a/actix-service/src/lib.rs b/actix-service/src/lib.rs
index 141d25b0..96bbf5b8 100644
--- a/actix-service/src/lib.rs
+++ b/actix-service/src/lib.rs
@@ -298,5 +298,5 @@ pub mod dev {
     pub use crate::map_err::{MapErr, MapErrServiceFactory};
     pub use crate::map_init_err::MapInitErr;
     pub use crate::then::{ThenService, ThenServiceFactory};
-    pub use crate::transform::{ApplyTransform, TransformMapInitErr};
+    pub use crate::transform::ApplyTransform;
 }
diff --git a/actix-service/src/transform.rs b/actix-service/src/transform.rs
index d57a6296..2b22b25f 100644
--- a/actix-service/src/transform.rs
+++ b/actix-service/src/transform.rs
@@ -1,5 +1,4 @@
 use std::future::Future;
-use std::marker::PhantomData;
 use std::pin::Pin;
 use std::rc::Rc;
 use std::sync::Arc;
@@ -37,17 +36,6 @@ pub trait Transform<S> {
 
     /// Creates and returns a new Service component, asynchronously
     fn new_transform(&self, service: S) -> Self::Future;
-
-    /// Map this service's factory error to a different error,
-    /// returning a new transform service factory.
-    fn map_init_err<F, E>(self, f: F) -> TransformMapInitErr<Self, S, F, E>
-    where
-        Self: Sized,
-        Self::Future: Unpin,
-        F: Fn(Self::InitError) -> E + Unpin + Clone,
-    {
-        TransformMapInitErr::new(self, f)
-    }
 }
 
 impl<T, S> Transform<S> for Rc<T>
@@ -187,90 +175,3 @@ where
         }
     }
 }
-
-/// Transform for the `map_err` combinator, changing the type of a new
-/// transform's init error.
-///
-/// This is created by the `Transform::map_err` method.
-pub struct TransformMapInitErr<T, S, F, E> {
-    t: T,
-    f: F,
-    e: PhantomData<(S, E)>,
-}
-
-impl<T, S, F, E> TransformMapInitErr<T, S, F, E> {
-    /// Create new `TransformMapErr` new transform instance
-    pub(crate) fn new(t: T, f: F) -> Self
-    where
-        T: Transform<S>,
-        T::Future: Unpin,
-        F: Fn(T::InitError) -> E + Unpin + Clone,
-    {
-        Self {
-            t,
-            f,
-            e: PhantomData,
-        }
-    }
-}
-
-impl<T, S, F, E> Clone for TransformMapInitErr<T, S, F, E>
-where
-    T: Clone,
-    F: Clone,
-{
-    fn clone(&self) -> Self {
-        Self {
-            t: self.t.clone(),
-            f: self.f.clone(),
-            e: PhantomData,
-        }
-    }
-}
-
-impl<T, S, F, E> Transform<S> for TransformMapInitErr<T, S, F, E>
-where
-    T: Transform<S>,
-    T::Future: Unpin,
-    F: Fn(T::InitError) -> E + Unpin + Clone,
-{
-    type Request = T::Request;
-    type Response = T::Response;
-    type Error = T::Error;
-    type Transform = T::Transform;
-
-    type InitError = E;
-    type Future = TransformMapInitErrFuture<T, S, F, E>;
-
-    fn new_transform(&self, service: S) -> Self::Future {
-        TransformMapInitErrFuture {
-            fut: self.t.new_transform(service),
-            f: self.f.clone(),
-        }
-    }
-}
-
-pub struct TransformMapInitErrFuture<T, S, F, E>
-where
-    T: Transform<S>,
-    T::Future: Unpin,
-    F: Fn(T::InitError) -> E + Unpin,
-{
-    fut: T::Future,
-    f: F,
-}
-
-impl<T, S, F, E> Future for TransformMapInitErrFuture<T, S, F, E>
-where
-    T: Transform<S>,
-    T::Future: Unpin,
-    F: Fn(T::InitError) -> E + Unpin + Clone,
-{
-    type Output = Result<T::Transform, E>;
-
-    fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
-        let this = self.get_mut();
-
-        Pin::new(&mut this.fut).poll(cx).map_err(&this.f)
-    }
-}