Merge pull request #806 from phadej/bytestring-0.11

Support bytestring-0.11

Author: bergmark

aeson.cabal

@@ -100,7 +100,7 @@ library
   -- GHC bundled libs
   build-depends:
     base             >= 4.7.0.0 && < 5,
-    bytestring       >= 0.10.4.0 && < 0.11,
+    bytestring       >= 0.10.4.0 && < 0.12,
     containers       >= 0.5.5.1 && < 0.7,
     deepseq          >= 1.3.0.0 && < 1.5,
     ghc-prim         >= 0.2     && < 0.8,

cabal.project

@@ -3,3 +3,4 @@ packages: .
 packages: attoparsec-iso8601
 packages: examples
 tests: true
+-- constraints: aeson +cffi

ffi/Data/Aeson/Parser/UnescapeFFI.hs

@@ -1,3 +1,4 @@
+{-# LANGUAGE CPP #-}
 {-# LANGUAGE ForeignFunctionInterface #-}
 {-# LANGUAGE MagicHash #-}
 {-# LANGUAGE UnliftedFFITypes #-}
@@ -29,7 +30,12 @@ foreign import ccall unsafe "_js_decode_string" c_js_decode
     -> Ptr Word8 -> Ptr Word8 -> IO CInt
 
 unescapeText' :: ByteString -> Text
+#if MIN_VERSION_bytestring(0,11,0)
+unescapeText' (BS fp len) = runText $ \done -> do
+  let off = 0
+#else
 unescapeText' (PS fp off len) = runText $ \done -> do
+#endif
   let go dest = withForeignPtr fp $ \ptr ->
         with (0::CSize) $ \destOffPtr -> do
           let end = ptr `plusPtr` (off + len)