Merge pull request #791 from phadej/remove-dead-cpp

Add remove some dead CPP

Author: bergmark

Data/Aeson/Types/FromJSON.hs

@@ -148,14 +148,7 @@ import qualified GHC.Exts as Exts
 import qualified Data.Primitive.Array as PM
 import qualified Data.Primitive.SmallArray as PM
 import qualified Data.Primitive.Types as PM
-
-#if MIN_VERSION_primitive(0,6,4)
-#if !MIN_VERSION_primitive(0,7,0)
-import qualified Data.Primitive.UnliftedArray as PM
-#endif
 import qualified Data.Primitive.PrimArray as PM
-#endif
-
 
 import Data.Coerce (Coercible, coerce)
 
@@ -2002,16 +1995,9 @@ instance FromJSON a => FromJSON (PM.Array a) where
 instance FromJSON a => FromJSON (PM.SmallArray a) where
   parseJSON = fmap Exts.fromList . parseJSON
 
-#if MIN_VERSION_primitive(0,6,4)
 instance (PM.Prim a,FromJSON a) => FromJSON (PM.PrimArray a) where
   parseJSON = fmap Exts.fromList . parseJSON
 
-#if !MIN_VERSION_primitive(0,7,0)
-instance (PM.PrimUnlifted a,FromJSON a) => FromJSON (PM.UnliftedArray a) where
-  parseJSON = fmap Exts.fromList . parseJSON
-#endif
-#endif
-
 -------------------------------------------------------------------------------
 -- time
 -------------------------------------------------------------------------------

Data/Aeson/Types/Internal.hs

@@ -110,10 +110,6 @@ import qualified Data.Scientific as S
 import qualified Data.Vector as V
 import qualified Language.Haskell.TH.Syntax as TH
 
-#if !MIN_VERSION_unordered_containers(0,2,6)
-import Data.List (sort)
-#endif
-
 -- | Elements of a JSON path used to describe the location of an
 -- error.
 data JSONPathElement = Key Text
@@ -405,14 +401,7 @@ instance IsString Value where
     {-# INLINE fromString #-}
 
 hashValue :: Int -> Value -> Int
-#if MIN_VERSION_unordered_containers(0,2,6)
 hashValue s (Object o)   = s `hashWithSalt` (0::Int) `hashWithSalt` o
-#else
-hashValue s (Object o)   = foldl' hashWithSalt
-                              (s `hashWithSalt` (0::Int)) assocHashesSorted
-  where
-    assocHashesSorted = sort [hash k `hashWithSalt` v | (k, v) <- H.toList o]
-#endif
 hashValue s (Array a)    = foldl' hashWithSalt
                               (s `hashWithSalt` (1::Int)) a
 hashValue s (String str) = s `hashWithSalt` (2::Int) `hashWithSalt` str

Data/Aeson/Types/ToJSON.hs

@@ -133,13 +133,7 @@ import qualified GHC.Exts as Exts
 import qualified Data.Primitive.Array as PM
 import qualified Data.Primitive.SmallArray as PM
 import qualified Data.Primitive.Types as PM
-
-#if MIN_VERSION_primitive(0,6,4)
-#if !MIN_VERSION_primitive(0,7,0)
-import qualified Data.Primitive.UnliftedArray as PM
-#endif
 import qualified Data.Primitive.PrimArray as PM
-#endif
 
 toJSONPair :: (a -> Value) -> (b -> Value) -> (a, b) -> Value
 toJSONPair a b = liftToJSON2 a (listValue a) b (listValue b)
@@ -1981,18 +1975,10 @@ instance ToJSON a => ToJSON (PM.SmallArray a) where
   toJSON = toJSON . Exts.toList
   toEncoding = toEncoding . Exts.toList
 
-#if (MIN_VERSION_primitive(0,6,4))
 instance (PM.Prim a,ToJSON a) => ToJSON (PM.PrimArray a) where
   toJSON = toJSON . Exts.toList
   toEncoding = toEncoding . Exts.toList
 
-#if !MIN_VERSION_primitive(0,7,0)
-instance (PM.PrimUnlifted a,ToJSON a) => ToJSON (PM.UnliftedArray a) where
-  toJSON = toJSON . Exts.toList
-  toEncoding = toEncoding . Exts.toList
-#endif
-#endif
-
 -------------------------------------------------------------------------------
 -- time
 -------------------------------------------------------------------------------