git.iko.soy/servant
on master help sign in
Fix for GHC-7.8.x
3bcbe80Pierre Radermecker
servant-client/src/Servant/Common/BaseUrl.hs+5−3
compare with master
unifiedsplit
@@ -1,5 +1,6 @@
1+{-# LANGUAGE DeriveDataTypeable #-}
1−{-# LANGUAGE DeriveGeneric #-}
2+{-# LANGUAGE DeriveGeneric #-}
2−{-# LANGUAGE ViewPatterns #-}
3+{-# LANGUAGE ViewPatterns #-}
3module Servant.Common.BaseUrl (
4module Servant.Common.BaseUrl (
4 -- * types
5 -- * types
5 BaseUrl (..)
6 BaseUrl (..)
@@ -12,6 +13,7 @@ module Servant.Common.BaseUrl (
12
13
13import Control.Monad.Catch (MonadThrow, throwM, Exception)
14import Control.Monad.Catch (MonadThrow, throwM, Exception)
14import Data.List
15import Data.List
16+import Data.Typeable
15import GHC.Generics
17import GHC.Generics
16import Network.URI
18import Network.URI
17import Safe
19import Safe
@@ -43,7 +45,7 @@ showBaseUrl (BaseUrl urlscheme host port) =
43 (Https, 443) -> ""
45 (Https, 443) -> ""
44 _ -> ":" ++ show port
46 _ -> ":" ++ show port
45
47
46−newtype InvalidBaseUrlException = InvalidBaseUrlException { _getInvalidUrlException :: String } deriving Show
48+data InvalidBaseUrlException = InvalidBaseUrlException String deriving (Show, Typeable)
47instance Exception InvalidBaseUrlException
49instance Exception InvalidBaseUrlException
48
50
49parseBaseUrl :: MonadThrow m => String -> m BaseUrl
51parseBaseUrl :: MonadThrow m => String -> m BaseUrl
servant-client/src/Servant/Common/Req.hs+3−2
@@ -1,4 +1,4 @@
1−{-# LANGUAGE AutoDeriveTypeable #-}
1+{-# LANGUAGE DeriveDataTypeable #-}
2{-# LANGUAGE CPP #-}
2{-# LANGUAGE CPP #-}
3{-# LANGUAGE OverloadedStrings #-}
3{-# LANGUAGE OverloadedStrings #-}
4{-# LANGUAGE ScopedTypeVariables #-}
4{-# LANGUAGE ScopedTypeVariables #-}
@@ -19,6 +19,7 @@ import Data.String.Conversions
19import Data.Proxy
19import Data.Proxy
20import Data.Text (Text)
20import Data.Text (Text)
21import Data.Text.Encoding
21import Data.Text.Encoding
22+import Data.Typeable
22import Network.HTTP.Client hiding (Proxy)
23import Network.HTTP.Client hiding (Proxy)
23import Network.HTTP.Client.TLS
24import Network.HTTP.Client.TLS
24import Network.HTTP.Media
25import Network.HTTP.Media
@@ -54,7 +55,7 @@ data ServantError
54 { responseContentTypeHeader :: ByteString
55 { responseContentTypeHeader :: ByteString
55 , responseBody :: ByteString
56 , responseBody :: ByteString
56 }
57 }
57− deriving (Show)
58+ deriving (Show, Typeable)
58
59
59instance Exception ServantError
60instance Exception ServantError
60
61