diff --git a/reflex-dom-core/src/Reflex/Dom/Xhr.hs b/reflex-dom-core/src/Reflex/Dom/Xhr.hs index 31095e5a..8dd81e14 100644 --- a/reflex-dom-core/src/Reflex/Dom/Xhr.hs +++ b/reflex-dom-core/src/Reflex/Dom/Xhr.hs @@ -1,5 +1,4 @@ {-# LANGUAGE CPP #-} -{-# LANGUAGE DeriveDataTypeable #-} {-# LANGUAGE DeriveFunctor #-} {-# LANGUAGE FlexibleContexts #-} {-# LANGUAGE GADTs #-} @@ -174,7 +173,6 @@ import Data.Text.Encoding import qualified Data.Text.Lazy as LT import qualified Data.Text.Lazy.Builder as B import Data.Traversable -import Data.Typeable import Language.Javascript.JSaddle.Monad (JSM, askJSM, runJSM, MonadJSM, liftJSM) @@ -183,7 +181,7 @@ data XhrRequest a , _xhrRequest_url :: Text , _xhrRequest_config :: XhrRequestConfig a } - deriving (Show, Read, Eq, Ord, Typeable, Functor) + deriving (Show, Read, Eq, Ord, Functor) data XhrRequestConfig a = XhrRequestConfig { _xhrRequestConfig_headers :: Map Text Text @@ -194,7 +192,7 @@ data XhrRequestConfig a , _xhrRequestConfig_withCredentials :: Bool , _xhrRequestConfig_responseHeaders :: XhrResponseHeaders } - deriving (Show, Read, Eq, Ord, Typeable, Functor) + deriving (Show, Read, Eq, Ord, Functor) data XhrResponse = XhrResponse { _xhrResponse_status :: Word @@ -203,12 +201,11 @@ data XhrResponse , _xhrResponse_responseText :: Maybe Text , _xhrResponse_headers :: Map (CI Text) Text } - deriving (Typeable) data XhrResponseHeaders = OnlyHeaders (Set.Set (CI Text)) -- ^ Parse a subset of headers from the XHR Response | AllHeaders -- ^ Parse all headers from the XHR Response - deriving (Show, Read, Eq, Ord, Typeable) + deriving (Show, Read, Eq, Ord) instance Default XhrResponseHeaders where def = OnlyHeaders mempty diff --git a/reflex-dom-core/src/Reflex/Dom/Xhr/Exception.hs b/reflex-dom-core/src/Reflex/Dom/Xhr/Exception.hs index f394a644..aa661af8 100644 --- a/reflex-dom-core/src/Reflex/Dom/Xhr/Exception.hs +++ b/reflex-dom-core/src/Reflex/Dom/Xhr/Exception.hs @@ -1,12 +1,9 @@ -{-# LANGUAGE DeriveDataTypeable #-} - module Reflex.Dom.Xhr.Exception where import Control.Exception (Exception (..)) -import Data.Typeable data XhrException = XhrException_Error | XhrException_Aborted - deriving (Show, Read, Eq, Ord, Typeable) + deriving (Show, Read, Eq, Ord) instance Exception XhrException diff --git a/reflex-dom-core/src/Reflex/Dom/Xhr/ResponseType.hs b/reflex-dom-core/src/Reflex/Dom/Xhr/ResponseType.hs index 360d2081..7c3d90e6 100644 --- a/reflex-dom-core/src/Reflex/Dom/Xhr/ResponseType.hs +++ b/reflex-dom-core/src/Reflex/Dom/Xhr/ResponseType.hs @@ -1,10 +1,7 @@ -{-# LANGUAGE DeriveDataTypeable #-} - module Reflex.Dom.Xhr.ResponseType where import Data.ByteString (ByteString) import Data.Text (Text) -import Data.Typeable import GHCJS.DOM.Blob (Blob) data XhrResponseType @@ -12,7 +9,7 @@ data XhrResponseType | XhrResponseType_ArrayBuffer | XhrResponseType_Blob | XhrResponseType_Text - deriving (Show, Read, Eq, Ord, Typeable) + deriving (Show, Read, Eq, Ord) data XhrResponseBody = XhrResponseBody_Default Text