From 454f53315f6c98ab1bc21702bc20bd77428f2803 Mon Sep 17 00:00:00 2001
From: Oleg Grenrus <oleg.grenrus@iki.fi>
Date: Sun, 11 Mar 2018 16:50:14 +0200
Subject: [PATCH] Remove catchServantError

---
 .../src/Servant/Client/Core/Internal/RunClient.hs          | 7 +------
 .../src/Servant/Client/Internal/XhrClient.hs               | 1 -
 servant-client/src/Servant/Client/Internal/HttpClient.hs   | 1 -
 3 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/servant-client-core/src/Servant/Client/Core/Internal/RunClient.hs b/servant-client-core/src/Servant/Client/Core/Internal/RunClient.hs
index 82d2858a..ac6e02ac 100644
--- a/servant-client-core/src/Servant/Client/Core/Internal/RunClient.hs
+++ b/servant-client-core/src/Servant/Client/Core/Internal/RunClient.hs
@@ -25,12 +25,11 @@ import           Servant.Client.Core.Internal.Request (Request, Response, GenRes
                                                        ServantError (..))
 import           Servant.Client.Core.Internal.ClientF
 
-class (Monad m) => RunClient m where
+class Monad m => RunClient m where
   -- | How to make a request.
   runRequest :: Request -> m Response
   streamingRequest :: Request -> m StreamingResponse
   throwServantError :: ServantError -> m a
-  catchServantError :: m a -> (ServantError -> m a) -> m a
 
 checkContentTypeHeader :: RunClient m => Response -> m MediaType
 checkContentTypeHeader response =
@@ -56,7 +55,3 @@ instance ClientF ~ f => RunClient (Free f) where
     runRequest req  = liftF (RunRequest req id)
     streamingRequest req = liftF (StreamingRequest req id)
     throwServantError = liftF . Throw
-    catchServantError x h = go x where
-        go (Pure a)         = Pure a
-        go (Free (Throw e)) = h e
-        go (Free f)         = Free (fmap go f)
diff --git a/servant-client-ghcjs/src/Servant/Client/Internal/XhrClient.hs b/servant-client-ghcjs/src/Servant/Client/Internal/XhrClient.hs
index 8cb77d22..27f09008 100644
--- a/servant-client-ghcjs/src/Servant/Client/Internal/XhrClient.hs
+++ b/servant-client-ghcjs/src/Servant/Client/Internal/XhrClient.hs
@@ -78,7 +78,6 @@ instance Alt ClientM where
 instance RunClient ClientM where
   runRequest = performRequest
   throwServantError = throwError
-  catchServantError = catchError
 
 instance ClientLike (ClientM a) (ClientM a) where
   mkClient = id
diff --git a/servant-client/src/Servant/Client/Internal/HttpClient.hs b/servant-client/src/Servant/Client/Internal/HttpClient.hs
index d3613650..f976deed 100644
--- a/servant-client/src/Servant/Client/Internal/HttpClient.hs
+++ b/servant-client/src/Servant/Client/Internal/HttpClient.hs
@@ -96,7 +96,6 @@ instance RunClient ClientM where
   runRequest = performRequest
   streamingRequest = performStreamingRequest
   throwServantError = throwError
-  catchServantError = catchError
 
 instance ClientLike (ClientM a) (ClientM a) where
   mkClient = id