454f533 · servant · git.iko.soy

servant-client-core/src/Servant/Client/Core/Internal/RunClient.hs+1−6

compare with master

unifiedsplit

@@ -25,12 +25,11 @@ import Servant.Client.Core.Internal.Request (Request, Response, GenRes

25 ServantError (..))

26import Servant.Client.Core.Internal.ClientF

27

28−class (Monad m) => RunClient m where

28+class Monad m => RunClient m where

29 -- | How to make a request.

30 runRequest :: Request -> m Response

31 streamingRequest :: Request -> m StreamingResponse

32 throwServantError :: ServantError -> m a

33− catchServantError :: m a -> (ServantError -> m a) -> m a

34

33

35checkContentTypeHeader :: RunClient m => Response -> m MediaType

34checkContentTypeHeader :: RunClient m => Response -> m MediaType

36checkContentTypeHeader response =

35checkContentTypeHeader response =

@@ -56,7 +55,3 @@ instance ClientF ~ f => RunClient (Free f) where

56 runRequest req = liftF (RunRequest req id)

55 runRequest req = liftF (RunRequest req id)

57 streamingRequest req = liftF (StreamingRequest req id)

56 streamingRequest req = liftF (StreamingRequest req id)

58 throwServantError = liftF . Throw

57 throwServantError = liftF . Throw

59− catchServantError x h = go x where

60− go (Pure a) = Pure a

61− go (Free (Throw e)) = h e

62− go (Free f) = Free (fmap go f)

servant-client-ghcjs/src/Servant/Client/Internal/XhrClient.hs−1

@@ -78,7 +78,6 @@ instance Alt ClientM where

78instance RunClient ClientM where

79 runRequest = performRequest

80 throwServantError = throwError

81− catchServantError = catchError

82

81

83instance ClientLike (ClientM a) (ClientM a) where

82instance ClientLike (ClientM a) (ClientM a) where

84 mkClient = id

83 mkClient = id

servant-client/src/Servant/Client/Internal/HttpClient.hs−1

@@ -96,7 +96,6 @@ instance RunClient ClientM where

96 runRequest = performRequest

97 streamingRequest = performStreamingRequest

98 throwServantError = throwError

99− catchServantError = catchError

100

99

101instance ClientLike (ClientM a) (ClientM a) where

100instance ClientLike (ClientM a) (ClientM a) where

102 mkClient = id

101 mkClient = id