Skip to content

Commit 264d17d

Browse files
committed
Stop deriving Typeable, obsolete since GHC 7.10
1 parent df54eb0 commit 264d17d

File tree

6 files changed

+4
-16
lines changed

6 files changed

+4
-16
lines changed

http-common/lib/Network/Http/Internal.hs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111

1212
{-# LANGUAGE BangPatterns #-}
1313
{-# LANGUAGE CPP #-}
14-
{-# LANGUAGE DeriveDataTypeable #-}
1514
{-# LANGUAGE OverloadedStrings #-}
1615
{-# OPTIONS_HADDOCK hide, prune #-}
1716

@@ -75,7 +74,6 @@ import Data.Map (Map)
7574
import Data.Int (Int64)
7675
import Data.List (foldl')
7776
import Data.Monoid as Mon (mconcat, mempty)
78-
import Data.Typeable (Typeable)
7977
import Data.Word (Word16)
8078

8179
{-
@@ -472,6 +470,6 @@ down (k, v) =
472470
(original k, v)
473471

474472
data HttpParseException = HttpParseException String
475-
deriving (Typeable, Show)
473+
deriving (Show)
476474

477475
instance Exception HttpParseException

http-streams/lib/Network/Http/Client/WebSocket.hs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
{-# LANGUAGE BangPatterns #-}
2-
{-# LANGUAGE DeriveDataTypeable #-}
32
{-# LANGUAGE NamedFieldPuns #-}
43
{-# LANGUAGE OverloadedStrings #-}
54
{-# LANGUAGE RecordWildCards #-}
@@ -69,7 +68,6 @@ import qualified Data.CaseInsensitive as CI
6968
import Data.IORef
7069
import Data.Maybe (isJust)
7170
import Data.Monoid (Monoid (..))
72-
import Data.Typeable (Typeable)
7371
import Data.Word
7472
import Data.XOR (xor32LazyByteString, xor32StrictByteString')
7573
import Network.Http.Client as HC
@@ -83,7 +81,7 @@ import qualified System.IO.Streams as Streams
8381
--
8482
-- @since 0.1.4.0
8583
data WsException = WsException String
86-
deriving (Typeable,Show)
84+
deriving (Show)
8785

8886
instance Exception WsException
8987

@@ -618,4 +616,3 @@ wsUpgradeConnection conn resource rqmod wskey failedToUpgrade success = do
618616
success resp conn
619617
where
620618
abort msg = throwIO (WsException ("wsUpgradeConnection: "++msg))
621-

http-streams/lib/Network/Http/Connection.hs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
-- the BSD licence.
1111
--
1212

13-
{-# LANGUAGE DeriveDataTypeable #-}
1413
{-# LANGUAGE DoAndIfThenElse #-}
1514
{-# LANGUAGE OverloadedStrings #-}
1615
{-# OPTIONS_HADDOCK hide, not-home #-}

http-streams/lib/Network/Http/Inconvenience.hs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212

1313
{-# LANGUAGE BangPatterns #-}
1414
{-# LANGUAGE CPP #-}
15-
{-# LANGUAGE DeriveDataTypeable #-}
1615
{-# LANGUAGE MagicHash #-}
1716
{-# LANGUAGE OverloadedStrings #-}
1817
{-# OPTIONS_HADDOCK hide, not-home #-}
@@ -62,7 +61,6 @@ import Data.IORef (IORef, newIORef, readIORef, writeIORef)
6261
import Data.List (intersperse)
6362
import qualified Data.Text as T
6463
import qualified Data.Text.Encoding as T
65-
import Data.Typeable (Typeable)
6664
import Data.Word (Word16)
6765
import GHC.Exts (Int(..), word2Int#, uncheckedShiftRL#)
6866
#if MIN_VERSION_base(4,16,0)
@@ -603,7 +601,7 @@ splitURI old new' =
603601

604602

605603
data TooManyRedirects = TooManyRedirects Int
606-
deriving (Typeable, Show, Eq)
604+
deriving (Show, Eq)
607605

608606
instance Exception TooManyRedirects
609607

@@ -765,7 +763,6 @@ concatHandler' p i =
765763
m = getStatusMessage p
766764

767765
data HttpClientError = HttpClientError Int ByteString
768-
deriving (Typeable)
769766

770767
instance Exception HttpClientError
771768

http-streams/lib/Network/Http/ResponseParser.hs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717

1818
{-# LANGUAGE BangPatterns #-}
1919
{-# LANGUAGE CPP #-}
20-
{-# LANGUAGE DeriveDataTypeable #-}
2120
{-# LANGUAGE OverloadedStrings #-}
2221
{-# OPTIONS_HADDOCK hide, not-home #-}
2322

@@ -42,7 +41,6 @@ import qualified Data.ByteString.Char8 as S
4241
import Data.CaseInsensitive (mk)
4342
import Data.Char (ord)
4443
import Data.Int (Int64)
45-
import Data.Typeable (Typeable)
4644
import System.IO.Streams (Generator, InputStream)
4745
import qualified System.IO.Streams as Streams
4846
import qualified System.IO.Streams.Attoparsec as Streams
@@ -174,7 +172,7 @@ readDecimal str' =
174172
{-# INLINE readDecimal #-}
175173

176174
data UnexpectedCompression = UnexpectedCompression String
177-
deriving (Typeable, Show)
175+
deriving (Show)
178176

179177
instance Exception UnexpectedCompression
180178

http-streams/lib/Network/Http/Utilities.hs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
--
2020

2121
{-# LANGUAGE BangPatterns #-}
22-
{-# LANGUAGE DeriveDataTypeable #-}
2322
{-# LANGUAGE MagicHash #-}
2423
{-# LANGUAGE OverloadedStrings #-}
2524
{-# LANGUAGE Rank2Types #-}

0 commit comments

Comments
 (0)