Hide deprecations warnings caused by attoparsec >= 0.12

trilogysci · Sep 30, 2014 · 5f2cd3e · 5f2cd3e
1 parent 2a38ffa
commit 5f2cd3e
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/Data/Aeson/Generic.hs b/Data/Aeson/Generic.hs
@@ -1,5 +1,10 @@
 {-# LANGUAGE PatternGuards, Rank2Types, ScopedTypeVariables, CPP #-}
 
+-- TODO: Drop this when we remove support for Data.Attoparsec.Number
+#if MIN_VERSION_attoparsec(0,12,0)
+{-# OPTIONS_GHC -fno-warn-deprecations #-}
+#endif
+
 -- |
 -- Module:      Data.Aeson.Generic
 -- Copyright:   (c) 2011, 2012, 2013 Bryan O'Sullivan

diff --git a/Data/Aeson/Parser/Internal.hs b/Data/Aeson/Parser/Internal.hs
@@ -33,8 +33,8 @@ import Data.ByteString.Builder
 
 import Control.Applicative ((*>), (<$>), (<*), liftA2, pure)
 import Data.Aeson.Types (Result(..), Value(..))
-import Data.Attoparsec.Char8 (Parser, char, endOfInput, scientific,
-                              skipSpace, string)
+import Data.Attoparsec.ByteString.Char8 (Parser, char, endOfInput, scientific,
+                                         skipSpace, string)
 import Data.Bits ((.|.), shiftL)
 import Data.ByteString (ByteString)
 import Data.Char (chr)
@@ -43,7 +43,7 @@ import Data.Text (Text)
 import Data.Text.Encoding (decodeUtf8')
 import Data.Vector as Vector (Vector, fromList)
 import Data.Word (Word8)
-import qualified Data.Attoparsec as A
+import qualified Data.Attoparsec.ByteString as A
 import qualified Data.Attoparsec.Lazy as L
 import qualified Data.Attoparsec.Zepto as Z
 import qualified Data.ByteString as B

diff --git a/Data/Aeson/Types/Instances.hs b/Data/Aeson/Types/Instances.hs
@@ -7,6 +7,11 @@
 {-# LANGUAGE DefaultSignatures #-}
 #endif
 
+-- TODO: Drop this when we remove support for Data.Attoparsec.Number
+#if MIN_VERSION_attoparsec(0,12,0)
+{-# OPTIONS_GHC -fno-warn-deprecations #-}
+#endif
+
 -- |
 -- Module:      Data.Aeson.Types.Instances
 -- Copyright:   (c) 2011-2013 Bryan O'Sullivan