From 0b40dd7c32ec453f3f93f5f5d9b8327a5aee5938 Mon Sep 17 00:00:00 2001
From: Lennart Spitzner <hexagoxel@hexagoxel.de>
Date: Wed, 4 Jul 2018 21:14:06 +0200
Subject: [PATCH] Fix deprecation warnings with latest versions of yaml

---
 src/Language/Haskell/Brittany/Internal.hs        | 3 ++-
 src/Language/Haskell/Brittany/Internal/Config.hs | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/Language/Haskell/Brittany/Internal.hs b/src/Language/Haskell/Brittany/Internal.hs
index dd07051..5b6e7ef 100644
--- a/src/Language/Haskell/Brittany/Internal.hs
+++ b/src/Language/Haskell/Brittany/Internal.hs
@@ -122,7 +122,8 @@ extractCommentConfigs anns (TopLevelDeclNameMap declNameMap) = do
         , \s -> "{" `isPrefixOf` dropWhile (== ' ') s
         , Butcher.addCmdPart (Butcher.varPartDesc "yaml-config-document")
         $ fmap (\lconf -> (mempty { _conf_layout = lconf }, ""))
-        . Data.Yaml.decode
+        . either (\_ -> Nothing) Just
+        . Data.Yaml.decodeEither'
         . Data.ByteString.Char8.pack
           -- TODO: use some proper utf8 encoder instead?
         )
diff --git a/src/Language/Haskell/Brittany/Internal/Config.hs b/src/Language/Haskell/Brittany/Internal/Config.hs
index e8ff5d6..2e63b49 100644
--- a/src/Language/Haskell/Brittany/Internal/Config.hs
+++ b/src/Language/Haskell/Brittany/Internal/Config.hs
@@ -235,14 +235,14 @@ readConfig path = do
   if exists
     then do
       contents <- liftIO $ ByteString.readFile path -- no lazy IO, tyvm.
-      fileConf <- case Data.Yaml.decodeEither contents of
+      fileConf <- case Data.Yaml.decodeEither' contents of
         Left e -> do
           liftIO
             $  putStrErrLn
             $  "error reading in brittany config from "
             ++ path
             ++ ":"
-          liftIO $ putStrErrLn e
+          liftIO $ putStrErrLn (Data.Yaml.prettyPrintParseException e)
           mzero
         Right x -> return x
       return $ Just fileConf