b628d9a · typeable/aeson

git.iko.soy/typeable/aeson

Hide deprecations warnings caused by attoparsec >= 0.12

commitb628d9a0d4d34442c38cce3fd1af78121fd7f4d8 authorBas van Dijk <v.dijk.bas@gmail.com> dateTue 30 Sep 2014, 16:48 (12 years ago) parentc142290

3 files changed+13−3

unifiedsplit

Data/Aeson/Generic.hs+5

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

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

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

38-- |

49-- Module: Data.Aeson.Generic

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

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

3333

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

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

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

37− skipSpace, string)

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

37+ skipSpace, string)

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

3939import Data.ByteString (ByteString)

4040import Data.Char (chr)

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

4343import Data.Text.Encoding (decodeUtf8')

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

4545import Data.Word (Word8)

46−import qualified Data.Attoparsec as A

46+import qualified Data.Attoparsec.ByteString as A

4747import qualified Data.Attoparsec.Lazy as L

4848import qualified Data.Attoparsec.Zepto as Z

4949import qualified Data.ByteString as B

Data/Aeson/Types/Instances.hs+5

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

77{-# LANGUAGE DefaultSignatures #-}

88#endif

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+

1015-- |

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