yaml 0.11.2.0 → 0.11.3.0
raw patch · 3 files changed
+13/−8 lines, 3 files
Files
- ChangeLog.md +4/−0
- src/Data/Yaml/Internal.hs +6/−5
- yaml.cabal +3/−3
ChangeLog.md view
@@ -1,5 +1,9 @@ # ChangeLog for yaml +## 0.11.3.0++* Don't wrap up async exceptions [#185](https://github.com/snoyberg/yaml/issues/185)+ ## 0.11.2.0 * Reduces some of the code duplication between the `encode` and `encodePretty` functions
src/Data/Yaml/Internal.hs view
@@ -303,12 +303,13 @@ -> IO (Either ParseException ([Warning], a)) decodeHelper_ src = do x <- try $ runResourceT $ runStateT (runConduit $ src .| runReaderT parse []) (ParseState Map.empty [])- return $ case x of+ case x of Left e- | Just pe <- fromException e -> Left pe- | Just ye <- fromException e -> Left $ InvalidYaml $ Just (ye :: YamlException)- | otherwise -> Left $ OtherParseException e- Right (y, st) -> either+ | Just pe <- fromException e -> return $ Left pe+ | Just ye <- fromException e -> return $ Left $ InvalidYaml $ Just (ye :: YamlException)+ | Just sae <- fromException e -> throwIO (sae :: SomeAsyncException)+ | otherwise -> return $ Left $ OtherParseException e+ Right (y, st) -> return $ either (Left . AesonException) Right ((,) (parseStateWarnings st) <$> parseEither parseJSON y)
yaml.cabal view
@@ -1,13 +1,13 @@ cabal-version: 1.12 --- This file has been generated from package.yaml by hpack version 0.31.2.+-- This file has been generated from package.yaml by hpack version 0.33.0. -- -- see: https://github.com/sol/hpack ----- hash: 1755dcdb4772fa7e743958ba68b120522981238fdcdac9fdc7494a36809ff6ae+-- hash: 4160e171cfd5a87614a9fbf40f548f75306e24d499c44f71c279d15f8c4e2c39 name: yaml-version: 0.11.2.0+version: 0.11.3.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