Use TH 2.16 Bytes literal (snoyberg#24)

hsyl20 · May 12, 2020 · 16672ba · 16672ba
1 parent ddb1906
commit 16672ba
Showing 1 changed file with 10 additions and 6 deletions.
diff --git a/Data/FileEmbed.hs b/Data/FileEmbed.hs
@@ -46,11 +46,7 @@ module Data.FileEmbed
 
 import Language.Haskell.TH.Syntax
     ( Exp (AppE, ListE, LitE, TupE, SigE, VarE)
-#if MIN_VERSION_template_haskell(2,5,0)
-    , Lit (StringL, StringPrimL, IntegerL)
-#else
-    , Lit (StringL, IntegerL)
-#endif
+    , Lit (..)
     , Q
     , runIO
     , qLocation, loc_filename
@@ -71,6 +67,10 @@ import System.IO.Unsafe (unsafePerformIO)
 import System.FilePath ((</>), takeDirectory, takeExtension)
 import Data.String (fromString)
 import Prelude as P
+#if MIN_VERSION_template_haskell(2,16,0)
+import Language.Haskell.TH
+import qualified Data.ByteString.Internal as B
+#endif
 
 -- | Embed a single file in your source code.
 --
@@ -155,7 +155,11 @@ bsToExp bs =
     return $ VarE 'unsafePerformIO
       `AppE` (VarE 'unsafePackAddressLen
       `AppE` LitE (IntegerL $ fromIntegral $ B8.length bs)
-#if MIN_VERSION_template_haskell(2, 8, 0)
+#if MIN_VERSION_template_haskell(2, 16, 0)
+      `AppE` LitE (bytesPrimL (
+                let B.PS ptr off sz = bs
+                in  mkBytes ptr (fromIntegral off) (fromIntegral sz))))
+#elif MIN_VERSION_template_haskell(2, 8, 0)
       `AppE` LitE (StringPrimL $ B.unpack bs))
 #else
       `AppE` LitE (StringPrimL $ B8.unpack bs))