Skip to content

Commit 4952822

Browse files
committed
Drop support for pre-7.6 GHC
* Bump base dependency * Bump `array` dependency * Assume at least 7.6 when compiling with GHC * Drop support for compiling without MIN_VERSION macros. These are now built into GHC. We can add some sort of support back if we expand to a non-GHC compiler, but that support will look completely different anyway. * Remove deprecated `Data.Map.Lazy.Merge` and `Data.Map.Strict.Merge` modules. These were renamed almost immediately after they were introduced. * Update changelog
1 parent b1a1e2f commit 4952822

33 files changed

+98
-291
lines changed

.travis.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,6 @@
22

33
# See also https://github.com/hvr/multi-ghc-travis for more information
44
env:
5-
- GHCVER=7.0.4 CABALVER=1.16
6-
# we have to use CABALVER=1.16 for GHC<7.6 as well, as there's
7-
# no package for earlier cabal versions in the PPA
8-
- GHCVER=7.4.2 CABALVER=1.16
95
- GHCVER=7.6.3 CABALVER=1.16
106
- GHCVER=7.8.4 CABALVER=1.18
117
- GHCVER=7.10.3 CABALVER=1.22

Data/Containers/ListUtils.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{-# LANGUAGE CPP #-}
22
{-# LANGUAGE BangPatterns #-}
3-
#if __GLASGOW_HASKELL__ >= 703
3+
#ifdef __GLASGOW_HASKELL__
44
{-# LANGUAGE Trustworthy #-}
55
#endif
66

Data/Graph.hs

Lines changed: 4 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,10 @@
11
{-# LANGUAGE CPP #-}
22
#if __GLASGOW_HASKELL__
3-
{-# LANGUAGE Rank2Types #-}
3+
{-# LANGUAGE RankNTypes #-}
44
{-# LANGUAGE DeriveDataTypeable #-}
5-
{-# LANGUAGE StandaloneDeriving #-}
6-
#endif
7-
#if __GLASGOW_HASKELL__ >= 703
8-
{-# LANGUAGE Trustworthy #-}
9-
#endif
10-
#if __GLASGOW_HASKELL__ >= 702
115
{-# LANGUAGE DeriveGeneric #-}
126
{-# LANGUAGE StandaloneDeriving #-}
7+
{-# LANGUAGE Trustworthy #-}
138
#endif
149

1510
#include "containers.h"
@@ -120,15 +115,11 @@ import Data.List
120115
import Data.Functor.Classes
121116
import Data.Semigroup (Semigroup (..))
122117
#endif
123-
#if __GLASGOW_HASKELL__ >= 706
124-
import GHC.Generics (Generic, Generic1)
125-
#elif __GLASGOW_HASKELL__ >= 702
126-
import GHC.Generics (Generic)
127-
#endif
128118
#ifdef __GLASGOW_HASKELL__
119+
import GHC.Generics (Generic, Generic1)
129120
import Data.Data (Data)
130-
#endif
131121
import Data.Typeable
122+
#endif
132123

133124

134125
-------------------------------------------------------------------------
@@ -156,14 +147,10 @@ INSTANCE_TYPEABLE1(SCC)
156147
#ifdef __GLASGOW_HASKELL__
157148
-- | @since 0.5.9
158149
deriving instance Data vertex => Data (SCC vertex)
159-
#endif
160150

161-
#if __GLASGOW_HASKELL__ >= 706
162151
-- | @since 0.5.9
163152
deriving instance Generic1 SCC
164-
#endif
165153

166-
#if __GLASGOW_HASKELL__ >= 702
167154
-- | @since 0.5.9
168155
deriving instance Generic (SCC vertex)
169156
#endif

Data/IntMap.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{-# LANGUAGE CPP #-}
2-
#if !defined(TESTING) && __GLASGOW_HASKELL__ >= 703
2+
#if !defined(TESTING) && defined(__GLASGOW_HASKELL__)
33
{-# LANGUAGE Safe #-}
44
#endif
55

Data/IntMap/Internal.hs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
{-# LANGUAGE MagicHash, DeriveDataTypeable, StandaloneDeriving #-}
66
{-# LANGUAGE ScopedTypeVariables #-}
77
#endif
8-
#if !defined(TESTING) && __GLASGOW_HASKELL__ >= 703
8+
#if !defined(TESTING) && defined(__GLASGOW_HASKELL__)
99
{-# LANGUAGE Trustworthy #-}
1010
#endif
1111
#if __GLASGOW_HASKELL__ >= 708
@@ -444,13 +444,10 @@ instance Foldable.Foldable IntMap where
444444
go (Tip _ v) = f v
445445
go (Bin _ _ l r) = go l `mappend` go r
446446
{-# INLINE foldMap #-}
447-
448-
#if MIN_VERSION_base(4,6,0)
449447
foldl' = foldl'
450448
{-# INLINE foldl' #-}
451449
foldr' = foldr'
452450
{-# INLINE foldr' #-}
453-
#endif
454451
#if MIN_VERSION_base(4,8,0)
455452
length = size
456453
{-# INLINE length #-}

Data/IntMap/Lazy.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{-# LANGUAGE CPP #-}
2-
#if !defined(TESTING) && __GLASGOW_HASKELL__ >= 703
2+
#if !defined(TESTING) && defined(__GLASGOW_HASKELL__)
33
{-# LANGUAGE Safe #-}
44
#endif
55

Data/IntMap/Merge/Lazy.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#if __GLASGOW_HASKELL__
44
{-# LANGUAGE DeriveDataTypeable, StandaloneDeriving #-}
55
#endif
6-
#if !defined(TESTING) && __GLASGOW_HASKELL__ >= 703
6+
#if !defined(TESTING) && defined(__GLASGOW_HASKELL__)
77
{-# LANGUAGE Safe #-}
88
#endif
99
#if __GLASGOW_HASKELL__ >= 708

Data/IntMap/Merge/Strict.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#if __GLASGOW_HASKELL__
44
{-# LANGUAGE DeriveDataTypeable, StandaloneDeriving #-}
55
#endif
6-
#if !defined(TESTING) && __GLASGOW_HASKELL__ >= 703
6+
#if !defined(TESTING) && defined(__GLASGOW_HASKELL__)
77
{-# LANGUAGE Safe #-}
88
#endif
99
#if __GLASGOW_HASKELL__ >= 708

Data/IntMap/Strict.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{-# LANGUAGE CPP #-}
22
{-# LANGUAGE BangPatterns #-}
3-
#if !defined(TESTING) && __GLASGOW_HASKELL__ >= 703
3+
#if !defined(TESTING) && defined(__GLASGOW_HASKELL__)
44
{-# LANGUAGE Trustworthy #-}
55
#endif
66

Data/IntSet.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{-# LANGUAGE CPP #-}
2-
#if !defined(TESTING) && __GLASGOW_HASKELL__ >= 703
2+
#if !defined(TESTING) && defined(__GLASGOW_HASKELL__)
33
{-# LANGUAGE Safe #-}
44
#endif
55

0 commit comments

Comments
 (0)