From 8d1229f2d42895b83606cd243b59dd5a36f8ea7f Mon Sep 17 00:00:00 2001
From: Falco Peijnenburg <falco@lumiguide.nl>
Date: Tue, 26 Sep 2017 21:38:44 +0200
Subject: [PATCH] servant-client-ghcjs: Renamed GhcjsClientM to ClientM

---
 .../src/Servant/Client/Ghcjs.hs               |  6 +--
 .../src/Servant/Client/Internal/XhrClient.hs  | 40 +++++++++----------
 2 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/servant-client-ghcjs/src/Servant/Client/Ghcjs.hs b/servant-client-ghcjs/src/Servant/Client/Ghcjs.hs
index b3e7e66b..08dbb0c2 100644
--- a/servant-client-ghcjs/src/Servant/Client/Ghcjs.hs
+++ b/servant-client-ghcjs/src/Servant/Client/Ghcjs.hs
@@ -4,9 +4,9 @@
 module Servant.Client.Ghcjs
   (
     client
-  , GhcjsClientM
-  , runGhcjsClientM
-  , GhcjsClientEnv(..)
+  , ClientM
+  , runClientM
+  , ClientEnv(..)
   , module Servant.Client.Core.Reexport
   ) where
 
diff --git a/servant-client-ghcjs/src/Servant/Client/Internal/XhrClient.hs b/servant-client-ghcjs/src/Servant/Client/Internal/XhrClient.hs
index b1122ec6..e9601015 100644
--- a/servant-client-ghcjs/src/Servant/Client/Internal/XhrClient.hs
+++ b/servant-client-ghcjs/src/Servant/Client/Internal/XhrClient.hs
@@ -44,46 +44,46 @@ newtype JSXMLHttpRequest = JSXMLHttpRequest JSVal
 
 newtype JSXMLHttpRequestClass = JSXMLHttpRequestClass JSVal
 
-newtype GhcjsClientEnv
-   = GhcjsClientEnv
+newtype ClientEnv
+   = ClientEnv
    { baseUrl :: BaseUrl }
    deriving (Eq, Show)
 
-client :: HasClient GhcjsClientM api => Proxy api -> Client GhcjsClientM api
-client api = api `clientIn` (Proxy :: Proxy GhcjsClientM)
+client :: HasClient ClientM api => Proxy api -> Client ClientM api
+client api = api `clientIn` (Proxy :: Proxy ClientM)
 
-newtype GhcjsClientM a = GhcjsClientM
-  { runGhcjsClientM' :: ReaderT GhcjsClientEnv (ExceptT ServantError IO) a }
+newtype ClientM a = ClientM
+  { runClientM' :: ReaderT ClientEnv (ExceptT ServantError IO) a }
   deriving ( Functor, Applicative, Monad, MonadIO, Generic
-           , MonadReader GhcjsClientEnv, MonadError ServantError, MonadThrow
+           , MonadReader ClientEnv, MonadError ServantError, MonadThrow
            , MonadCatch)
 
-instance MonadBase IO GhcjsClientM where
-  liftBase = GhcjsClientM . liftBase
+instance MonadBase IO ClientM where
+  liftBase = ClientM . liftBase
 
-instance MonadBaseControl IO GhcjsClientM where
-  type StM GhcjsClientM a = Either ServantError a
+instance MonadBaseControl IO ClientM where
+  type StM ClientM a = Either ServantError a
 
-  liftBaseWith f = GhcjsClientM (liftBaseWith (\g -> f (g . runGhcjsClientM')))
+  liftBaseWith f = ClientM (liftBaseWith (\g -> f (g . runClientM')))
 
-  restoreM st = GhcjsClientM (restoreM st)
+  restoreM st = ClientM (restoreM st)
 
 -- | Try clients in order, last error is preserved.
-instance Alt GhcjsClientM where
+instance Alt ClientM where
   a <!> b = a `catchError` const b
 
-instance RunClient GhcjsClientM where
+instance RunClient ClientM where
   runRequest = performRequest
   throwServantError = throwError
   catchServantError = catchError
 
-instance ClientLike (GhcjsClientM a) (GhcjsClientM a) where
+instance ClientLike (ClientM a) (ClientM a) where
   mkClient = id
 
-runGhcjsClientM :: GhcjsClientM a -> GhcjsClientEnv -> IO (Either ServantError a)
-runGhcjsClientM cm env = runExceptT $ flip runReaderT env $ runGhcjsClientM' cm
+runClientM :: ClientM a -> ClientEnv -> IO (Either ServantError a)
+runClientM cm env = runExceptT $ flip runReaderT env $ runClientM' cm
 
-performRequest :: Request -> GhcjsClientM Response
+performRequest :: Request -> ClientM Response
 performRequest req = do
   xhr <- liftIO initXhr
   burl <- asks baseUrl
@@ -188,7 +188,7 @@ toBody request = case requestBody request of
 
 -- This function is only supposed to handle 'ConnectionError's. Other
 -- 'ServantError's are created in Servant.Client.Req.
-toResponse :: JSXMLHttpRequest -> GhcjsClientM Response
+toResponse :: JSXMLHttpRequest -> ClientM Response
 toResponse xhr = do
   status <- liftIO $ getStatus xhr
   case status of