Require lattices >= 2

data-interval.cabal

@@ -48,7 +48,7 @@ Library
      , extended-reals >=0.2 && <1.0
   if flag(lattices)
     build-depends:
-     lattices >=1.2.1.1 && <2.3
+     lattices >=2 && <2.3
   Default-Language: Haskell2010
   Other-Extensions:
      ScopedTypeVariables

src/Data/IntegerInterval.hs

@@ -137,8 +137,6 @@ upperBound' x =
     ub@_ -> (ub, Open)
 
 #ifdef MIN_VERSION_lattices
-#if MIN_VERSION_lattices(2,0,0)
-
 instance Lattice IntegerInterval where
   (\/) = hull
   (/\) = intersection
@@ -148,26 +146,6 @@ instance BoundedJoinSemiLattice IntegerInterval where
 
 instance BoundedMeetSemiLattice IntegerInterval where
   top = whole
-
-#else
-
-instance JoinSemiLattice IntegerInterval where
-  join = hull
-
-instance MeetSemiLattice IntegerInterval where
-  meet = intersection
-
-instance Lattice IntegerInterval
-
-instance BoundedJoinSemiLattice IntegerInterval where
-  bottom = empty
-
-instance BoundedMeetSemiLattice IntegerInterval where
-  top = whole
-
-instance BoundedLattice IntegerInterval
-
-#endif
 #endif
 
 instance Show IntegerInterval where

src/Data/Interval.hs

@@ -119,8 +119,6 @@ infix 4 >??
 infix 4 /=??
 
 #ifdef MIN_VERSION_lattices
-#if MIN_VERSION_lattices(2,0,0)
-
 instance (Ord r) => Lattice (Interval r) where
   (\/) = hull
   (/\) = intersection
@@ -130,26 +128,6 @@ instance (Ord r) => BoundedJoinSemiLattice (Interval r) where
 
 instance (Ord r) => BoundedMeetSemiLattice (Interval r) where
   top = whole
-
-#else
-
-instance (Ord r) => JoinSemiLattice (Interval r) where
-  join = hull
-
-instance (Ord r) => MeetSemiLattice (Interval r) where
-  meet = intersection
-
-instance (Ord r) => Lattice (Interval r)
-
-instance (Ord r) => BoundedJoinSemiLattice (Interval r) where
-  bottom = empty
-
-instance (Ord r) => BoundedMeetSemiLattice (Interval r) where
-  top = whole
-
-instance (Ord r) => BoundedLattice (Interval r)
-
-#endif
 #endif
 
 instance (Ord r, Show r) => Show (Interval r) where

src/Data/IntervalSet.hs

@@ -135,8 +135,6 @@ instance Hashable r => Hashable (IntervalSet r) where
   hashWithSalt s (IntervalSet m) = hashWithSalt s (Map.toList m)
 
 #ifdef MIN_VERSION_lattices
-#if MIN_VERSION_lattices(2,0,0)
-
 instance (Ord r) => Lattice (IntervalSet r) where
   (\/) = union
   (/\) = intersection
@@ -146,26 +144,6 @@ instance (Ord r) => BoundedJoinSemiLattice (IntervalSet r) where
 
 instance (Ord r) => BoundedMeetSemiLattice (IntervalSet r) where
   top = whole
-
-#else
-
-instance (Ord r) => JoinSemiLattice (IntervalSet r) where
-  join = union
-
-instance (Ord r) => MeetSemiLattice (IntervalSet r) where
-  meet = intersection
-
-instance (Ord r) => Lattice (IntervalSet r)
-
-instance (Ord r) => BoundedJoinSemiLattice (IntervalSet r) where
-  bottom = empty
-
-instance (Ord r) => BoundedMeetSemiLattice (IntervalSet r) where
-  top = whole
-
-instance (Ord r) => BoundedLattice (IntervalSet r)
-
-#endif
 #endif
 
 instance Ord r => Monoid (IntervalSet r) where

test/TestIntervalMap.hs

@@ -10,10 +10,6 @@ import qualified Data.Foldable as F
 import Data.Generics.Schemes
 import Data.Hashable
 import Data.Maybe
-#if __GLASGOW_HASKELL__ < 710
-import Control.Applicative ((<$>))
-import Data.Traversable (Traversable(..))
-#endif
 #if __GLASGOW_HASKELL__ < 804
 import Data.Semigroup ((<>))
 #endif