git.iko.soy/typeable/yaml
on master help sign in
Add CPP blocks to deal with deprecations in aeson-1.0.0

aeson 1.0.0.0 deprecates Data.Aeson.Encode. This change changes the relevant import statement to import from Data.Aeson.Text, while retaining compatibility with pre-1.0.0 aeson through CPP.

commit44779be603768db9764f7dabbddfd4cadb3ea7f2 authorStijn van Drongelen <rhymoid@gmail.com> dateThu 15 Jun 2017, 18:35 (9 years ago) parent0f18162
2 files changed+8
compare with master
unifiedsplit
Data/Yaml.hs+4 Data/Yaml/Builder.hs+4
Data/Yaml.hs+4
@@ -78,7 +78,11 @@ import Data.Aeson
7878 , Object, Array
7979 , withObject, withText, withArray, withScientific, withBool
8080 )
81+#if MIN_VERSION_aeson(1,0,0)
82+import Data.Aeson.Text (encodeToTextBuilder)
83+#else
8184import Data.Aeson.Encode (encodeToTextBuilder)
85+#endif
8286import Data.Aeson.Types (Pair, parseMaybe, parseEither, Parser)
8387import Data.ByteString (ByteString)
8488import qualified Data.Conduit as C
Data/Yaml/Builder.hs+4
@@ -22,7 +22,11 @@ import Prelude hiding (null)
2222
2323import Control.Arrow (second)
2424import Control.Monad.Trans.Resource (runResourceT)
25+#if MIN_VERSION_aeson(1,0,0)
26+import Data.Aeson.Text (encodeToTextBuilder)
27+#else
2528import Data.Aeson.Encode (encodeToTextBuilder)
29+#endif
2630import Data.Aeson.Types (Value(..))
2731import Data.ByteString (ByteString)
2832import qualified Data.ByteString.Char8 as S8