Switch from template-haskell to template-haskell-lift

Author: TeofilC

Data/ByteString/Internal/Type.hs

@@ -195,8 +195,7 @@ import GHC.Int                  (Int (..))
 import GHC.ForeignPtr           (unsafeWithForeignPtr)
 #endif
 
-import qualified Language.Haskell.TH.Lib as TH
-import qualified Language.Haskell.TH.Syntax as TH
+import qualified Language.Haskell.TH.Lift as TH
 
 #if !HS_unsafeWithForeignPtr_AVAILABLE
 unsafeWithForeignPtr :: ForeignPtr a -> (Ptr a -> IO b) -> IO b
@@ -360,24 +359,13 @@ byteStringDataType = mkDataType "Data.ByteString.ByteString" [packConstr]
 
 -- | @since 0.11.2.0
 instance TH.Lift ByteString where
-#if MIN_VERSION_template_haskell(2,16,0)
--- template-haskell-2.16 first ships with ghc-8.10
-  lift (BS ptr len) = [| unsafePackLenLiteral |]
-    `TH.appE` TH.litE (TH.integerL (fromIntegral len))
-    `TH.appE` TH.litE (TH.BytesPrimL $ TH.Bytes ptr 0 (fromIntegral len))
-#else
-  lift bs@(BS _ len) = [| unsafePackLenLiteral |]
-    `TH.appE` TH.litE (TH.integerL (fromIntegral len))
-    `TH.appE` TH.litE (TH.StringPrimL $ unpackBytes bs)
-#endif
+  lift (BS ptr len) =
+    [| unsafePackLenLiteral
+        $(TH.lift len)
+        $(TH.liftAddrCompat ptr 0 (fromIntegral len))
+     |]
 
-#if MIN_VERSION_template_haskell(2,17,0)
--- template-haskell-2.17 first ships with ghc-9.0
-  liftTyped = TH.unsafeCodeCoerce . TH.lift
-#elif MIN_VERSION_template_haskell(2,16,0)
--- template-haskell-2.16 first ships with ghc-8.10
-  liftTyped = TH.unsafeTExpCoerce . TH.lift
-#endif
+  liftTyped = TH.defaultLiftTyped
 
 ------------------------------------------------------------------------
 -- Internal indexing

Data/ByteString/Lazy/Internal.hs

@@ -63,7 +63,7 @@ import Data.Data                (Data(..), mkConstr ,mkDataType, Constr, DataTyp
 
 import GHC.Exts                 (IsList(..))
 
-import qualified Language.Haskell.TH.Syntax as TH
+import qualified Language.Haskell.TH.Lift as TH
 
 #ifdef HS_BYTESTRING_ASSERTIONS
 import Control.Exception (assert)

Data/ByteString/Short/Internal.hs

@@ -248,7 +248,7 @@ import qualified Data.ByteString.Lazy.Internal as LBS
 
 import qualified Data.List as List
 import qualified GHC.Exts
-import qualified Language.Haskell.TH.Syntax as TH
+import qualified Language.Haskell.TH.Lift as TH
 
 -- | A compact representation of a 'Word8' vector.
 --

bytestring.cabal

@@ -109,7 +109,7 @@ common language
 
 library
   import:          language
-  build-depends:   base >= 4.12 && < 5, ghc-prim, deepseq, template-haskell
+  build-depends:   base >= 4.12 && < 5, ghc-prim, deepseq, template-haskell-lift >= 0.1 && <0.2
 
   if impl(ghc < 9.4)
     build-depends: data-array-byte >= 0.1 && < 0.2
@@ -222,7 +222,7 @@ test-suite bytestring-tests
                     QuickCheck,
                     tasty,
                     tasty-quickcheck >= 0.8.1,
-                    template-haskell,
+                    template-haskell-lift,
                     transformers >= 0.3,
                     syb