Merge pull request #859 from alexfmpe/ghc8.0-leftovers

Remove CPP redundant since bump to ghc 8.0

Author: treeowl

containers/src/Data/Map.hs

@@ -4,10 +4,7 @@
 #endif
 
 #ifdef __GLASGOW_HASKELL__
-{-# LANGUAGE DataKinds, FlexibleContexts #-}
-#endif
-#if __GLASGOW_HASKELL__ >= 800
-{-# LANGUAGE MonoLocalBinds #-}
+{-# LANGUAGE DataKinds, FlexibleContexts, MonoLocalBinds #-}
 #endif
 
 #include "containers.h"

containers/src/Data/Map/Internal/DeprecatedShowTree.hs

@@ -1,12 +1,4 @@
-{-# LANGUAGE CPP, FlexibleContexts, DataKinds #-}
-#if __GLASGOW_HASKELL__ >= 800
-{-# LANGUAGE MonoLocalBinds #-}
-#endif
-#if __GLASGOW_HASKELL__ < 710
--- Why do we need this? Guess it doesn't matter; this is all
--- going away soon.
-{-# LANGUAGE Trustworthy #-}
-#endif
+{-# LANGUAGE CPP, FlexibleContexts, DataKinds, MonoLocalBinds #-}
 
 #include "containers.h"
 

containers/src/Data/Set/Internal.hs

@@ -155,14 +155,10 @@ module Data.Set.Internal (
             , unions
             , difference
             , intersection
-#if (MIN_VERSION_base(4,9,0))
             , intersections
-#endif
             , cartesianProduct
             , disjointUnion
-#if (MIN_VERSION_base(4,9,0))
             , Intersection(..)
-#endif
 
 
             -- * Filter
@@ -883,7 +879,6 @@ intersection t1@(Bin _ x l1 r1) t2
 {-# INLINABLE intersection #-}
 #endif
 
-#if (MIN_VERSION_base(4,9,0))
 -- | The intersection of a series of sets. Intersections are performed left-to-right.
 intersections :: Ord a => NonEmpty (Set a) -> Set a
 intersections (s0 :| ss) = List.foldr go id ss s0
@@ -899,7 +894,6 @@ newtype Intersection a = Intersection { getIntersection :: Set a }
 instance (Ord a) => Semigroup (Intersection a) where
     (Intersection a) <> (Intersection b) = Intersection $ intersection a b
     stimes = stimesIdempotent
-#endif
 
 {--------------------------------------------------------------------
   Filter and partition