b628d9a · typeable/aeson

Data/Aeson/Generic.hs+5

compare with master

unifiedsplit

@@ -1,5 +1,10 @@

1{-# LANGUAGE PatternGuards, Rank2Types, ScopedTypeVariables, CPP #-}

2

3+-- TODO: Drop this when we remove support for Data.Attoparsec.Number

4+#if MIN_VERSION_attoparsec(0,12,0)

5+{-# OPTIONS_GHC -fno-warn-deprecations #-}

6+#endif

7+

3-- |

8-- |

4-- Module: Data.Aeson.Generic

9-- Module: Data.Aeson.Generic

Data/Aeson/Parser/Internal.hs+3−3

@@ -33,8 +33,8 @@ import Data.ByteString.Builder

33

34import Control.Applicative ((*>), (<$>), (<*), liftA2, pure)

35import Data.Aeson.Types (Result(..), Value(..))

36−import Data.Attoparsec.Char8 (Parser, char, endOfInput, scientific,

36+import Data.Attoparsec.ByteString.Char8 (Parser, char, endOfInput, scientific,

37− skipSpace, string)

37+ skipSpace, string)

38import Data.Bits ((.|.), shiftL)

39import Data.ByteString (ByteString)

40import Data.Char (chr)

@@ -43,7 +43,7 @@ import Data.Text (Text)

43import Data.Text.Encoding (decodeUtf8')

44import Data.Vector as Vector (Vector, fromList)

45import Data.Word (Word8)

46−import qualified Data.Attoparsec as A

46+import qualified Data.Attoparsec.ByteString as A

47import qualified Data.Attoparsec.Lazy as L

48import qualified Data.Attoparsec.Zepto as Z

49import qualified Data.ByteString as B

Data/Aeson/Types/Instances.hs+5

@@ -7,6 +7,11 @@

7{-# LANGUAGE DefaultSignatures #-}

8#endif

9

10+-- TODO: Drop this when we remove support for Data.Attoparsec.Number

11+#if MIN_VERSION_attoparsec(0,12,0)

12+{-# OPTIONS_GHC -fno-warn-deprecations #-}

13+#endif

14+

10-- |

15-- |

11-- Module: Data.Aeson.Types.Instances

16-- Module: Data.Aeson.Types.Instances