Switch from template-haskell to template-haskell-lift

Author: TeofilC

containers/containers.cabal

@@ -43,7 +43,7 @@ Library
       , array >= 0.4.0.0
       , deepseq >= 1.4.3.0 && < 1.6
     if impl(ghc)
-       build-depends: template-haskell
+       build-depends: template-haskell-lift >= 0.1 && <0.2
     hs-source-dirs: src
     ghc-options: -O2 -Wall
 

containers/src/Data/Graph.hs

@@ -143,9 +143,7 @@ import Data.Semigroup (Semigroup (..))
 #ifdef __GLASGOW_HASKELL__
 import GHC.Generics (Generic, Generic1)
 import Data.Data (Data)
-import Language.Haskell.TH.Syntax (Lift(..))
--- See Note [ Template Haskell Dependencies ]
-import Language.Haskell.TH ()
+import Language.Haskell.TH.Lift (Lift)
 #endif
 
 -- Make sure we don't use Integer by mistake.
@@ -191,7 +189,7 @@ deriving instance Generic1 SCC
 deriving instance Generic (SCC vertex)
 
 -- There is no instance Lift (NonEmpty v) before template-haskell-2.15.
-#if MIN_VERSION_template_haskell(2,15,0)
+#if __GLASGOW_HASKELL__ > 804
 -- | @since 0.6.6
 deriving instance Lift vertex => Lift (SCC vertex)
 #else

containers/src/Data/IntMap/Internal.hs

@@ -355,9 +355,7 @@ import Data.Data (Data(..), Constr, mkConstr, constrIndex,
 import qualified Data.Data as Data
 import GHC.Exts (build)
 import qualified GHC.Exts as GHCExts
-import Language.Haskell.TH.Syntax (Lift)
--- See Note [ Template Haskell Dependencies ]
-import Language.Haskell.TH ()
+import Language.Haskell.TH.Lift (Lift)
 #endif
 #if defined(__GLASGOW_HASKELL__) || defined(__MHS__)
 import Text.Read

containers/src/Data/IntSet/Internal.hs

@@ -226,9 +226,7 @@ import Data.Coerce (coerce)
 
 #if __GLASGOW_HASKELL__
 import qualified GHC.Exts
-import Language.Haskell.TH.Syntax (Lift)
--- See Note [ Template Haskell Dependencies ]
-import Language.Haskell.TH ()
+import Language.Haskell.TH.Lift (Lift)
 #endif
 
 import qualified Data.Foldable as Foldable

containers/src/Data/Map/Internal.hs

@@ -412,9 +412,7 @@ import Utils.Containers.Internal.BitUtil (wordSize)
 
 #if __GLASGOW_HASKELL__
 import GHC.Exts (build, lazy)
-import Language.Haskell.TH.Syntax (Lift)
--- See Note [ Template Haskell Dependencies ]
-import Language.Haskell.TH ()
+import Language.Haskell.TH.Lift (Lift)
 #  ifdef USE_MAGIC_PROXY
 import GHC.Exts (Proxy#, proxy# )
 #  endif

containers/src/Data/Sequence/Internal.hs

@@ -213,9 +213,7 @@ import Text.Read (Lexeme(Ident), lexP, parens, prec,
 import GHC.Exts (build)
 import Data.Data
 import Data.String (IsString(..))
-import qualified Language.Haskell.TH.Syntax as TH
--- See Note [ Template Haskell Dependencies ]
-import Language.Haskell.TH ()
+import qualified Language.Haskell.TH.Lift as TH
 import GHC.Generics (Generic, Generic1)
 
 -- Array stuff, with GHC.Arr on GHC
@@ -330,7 +328,8 @@ newtype Seq a = Seq (FingerTree (Elem a))
 #ifdef __GLASGOW_HASKELL__
 -- | @since 0.6.6
 instance TH.Lift a => TH.Lift (Seq a) where
-#  if MIN_VERSION_template_haskell(2,16,0)
+-- template-haskell >= 2.16
+#  if __GLASGOW_HASKELL__ > 810
   liftTyped t = [|| coerceFT z ||]
 #  else
   lift t = [| coerceFT z |]

containers/src/Data/Set/Internal.hs

@@ -252,10 +252,7 @@ import Text.Read ( readPrec, Read (..), Lexeme (..), parens, prec
 import GHC.Exts ( build, lazy )
 import qualified GHC.Exts as GHCExts
 import Data.Data
-import Language.Haskell.TH.Syntax (Lift)
--- See Note [ Template Haskell Dependencies ]
-import Language.Haskell.TH ()
-import Data.Coerce (coerce)
+import Language.Haskell.TH.Lift (Lift)
 #endif
 
 

containers/src/Data/Tree.hs

@@ -75,9 +75,7 @@ import Control.DeepSeq (NFData(rnf),NFData1(liftRnf))
 import Data.Data (Data)
 import GHC.Generics (Generic, Generic1)
 import qualified GHC.Exts
-import Language.Haskell.TH.Syntax (Lift)
--- See Note [ Template Haskell Dependencies ]
-import Language.Haskell.TH ()
+import Language.Haskell.TH.Lift (Lift)
 #endif
 
 import Control.Monad.Zip (MonadZip (..))