yaml 0.11.10.0 → 0.11.11.0

raw patch · 3 files changed

+12/−4 lines, 3 files

Files

• ChangeLog.md +4/−0
• src/Data/Yaml/Internal.hs +7/−3
• yaml.cabal +1/−1

@@ -1,5 +1,9 @@ # ChangeLog for yaml +## 0.11.11.0++* Fix ambiguous occurrence `AesonException`+ ## 0.11.10.0  * Undo previous change (breakage with aeson 2)

@@ -34,7 +34,11 @@ import Control.Monad.Trans.Resource (ResourceT, runResourceT) import Control.Monad.State.Strict import Control.Monad.Reader+#if MIN_VERSION_aeson(2,1,2)+import Data.Aeson hiding (AesonException)+#else import Data.Aeson+#endif #if MIN_VERSION_aeson(2,0,0) import qualified Data.Aeson.Key as K import qualified Data.Aeson.KeyMap as M@@ -51,7 +55,7 @@ import qualified Data.ByteString.Lazy as BL import Data.ByteString.Builder.Scientific (scientificBuilder) import Data.Char (toUpper, ord)-import Data.List+import qualified Data.List as List import Data.Conduit ((.|), ConduitM, runConduit) import qualified Data.Conduit.List as CL import qualified Data.HashSet as HashSet@@ -314,14 +318,14 @@               if s == "<<"                          then case o of                                   Object l  -> return (merge l)-                                  Array l -> return $ merge $ foldl' mergeObjects M.empty $ V.toList l+                                  Array l -> return $ merge $ List.foldl' mergeObjects M.empty $ V.toList l                                   _          -> al                          else al             parseM mergedKeys' a al'     where mergeObjects al (Object om) = M.union al om           mergeObjects al _           = al -          merge xs = (Set.fromList (M.keys xs \\ M.keys front), M.union front xs)+          merge xs = (Set.fromList (M.keys xs List.\\ M.keys front), M.union front xs)  parseSrc :: ReaderT JSONPath (ConduitM Event Void Parse) val          -> ConduitM () Event Parse ()

@@ -5,7 +5,7 @@ -- see: https://github.com/sol/hpack  name:           yaml-version:        0.11.10.0+version:        0.11.11.0 synopsis:       Support for parsing and rendering YAML documents. description:    README and API documentation are available at <https://www.stackage.org/package/yaml> category:       Data