Skip to content

Commit 9bfb2ca

Browse files
committed
remove deprecated Typeable deriving
1 parent 7913b3f commit 9bfb2ca

File tree

3 files changed

+5
-8
lines changed

3 files changed

+5
-8
lines changed

src/Configuration/Utils/ConfigFile.hs

+2-3
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,6 @@ import Data.Maybe
7878
import Data.Monoid.Unicode
7979
import Data.String
8080
import qualified Data.Text as T
81-
import Data.Typeable
8281

8382
import Prelude hiding (any, concatMap, mapM_)
8483

@@ -254,7 +253,7 @@ infix 6 %.:
254253
data ConfigFile
255254
= ConfigFileRequired { getConfigFile !T.Text }
256255
| ConfigFileOptional { getConfigFile !T.Text }
257-
deriving (Show, Read, Eq, Ord, Typeable)
256+
deriving (Show, Read, Eq, Ord)
258257

259258
-- | An /internal/ type for the meta configuration that specifies how the
260259
-- configuration files are loaded and parsed.
@@ -263,7 +262,7 @@ data ConfigFile
263262
data ConfigFilesConfig = ConfigFilesConfig
264263
{ _cfcHttpsPolicy !HttpsCertPolicy
265264
}
266-
deriving (Show, Eq, Typeable)
265+
deriving (Show, Eq)
267266

268267
cfcHttpsPolicy Lens' ConfigFilesConfig HttpsCertPolicy
269268
cfcHttpsPolicy = lens _cfcHttpsPolicy $ \a b a { _cfcHttpsPolicy = b }

src/Configuration/Utils/Internal/ConfigFileReader.hs

+1-2
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ import Data.Bifunctor
5050
import qualified Data.ByteString.Char8 as B8
5151
import Data.Monoid.Unicode
5252
import qualified Data.Text as T
53-
import Data.Typeable
5453
import qualified Data.Yaml as Yaml
5554

5655
import GHC.Generics
@@ -155,7 +154,7 @@ data ConfigFileFormat
155154
= Yaml
156155
| Json
157156
| Other
158-
deriving (Show, Read, Eq, Ord, Enum, Bounded, Typeable, Generic)
157+
deriving (Show, Read, Eq, Ord, Enum, Bounded, Generic)
159158

160159
instance NFData ConfigFileFormat
161160

src/Configuration/Utils/Internal/HttpsCertPolicy.hs

+2-3
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@ import Data.Monoid.Unicode
5252
import Data.String
5353
import qualified Data.Text as T
5454
import qualified Data.Text.Encoding as T
55-
import Data.Typeable
5655
import qualified Data.X509 as TLS
5756
import qualified Data.X509.Validation as TLS
5857

@@ -80,7 +79,7 @@ data HttpsCertPolicy = HttpsCertPolicy
8079
, _certPolicyHostFingerprints !(HM.HashMap TLS.ServiceID TLS.Fingerprint)
8180
-- ^ a whitelist for services with trusted certificates
8281
}
83-
deriving (Show, Eq, Typeable)
82+
deriving (Show, Eq)
8483

8584
certPolicyInsecure Lens' HttpsCertPolicy Bool
8685
certPolicyInsecure = lens _certPolicyInsecure $ \s a s { _certPolicyInsecure = a }
@@ -177,7 +176,7 @@ httpWithValidationPolicy request policy = do
177176
-- In particular exceptions should include rejected certificates.
178177
--
179178
newtype VerboseTlsException = VerboseTlsException T.Text
180-
deriving (Eq, Ord, Typeable)
179+
deriving (Eq, Ord)
181180

182181
instance Show VerboseTlsException where
183182
show (VerboseTlsException msg) = "TLS exception: " T.unpack msg

0 commit comments

Comments
 (0)