From 17fb271694d5d2936564776f804918fabf1cb730 Mon Sep 17 00:00:00 2001 From: Lennart Spitzner Date: Tue, 17 Apr 2018 20:34:11 +0200 Subject: [PATCH] Fix inlineconfig additions for ghc-8.4 + compat The semigroup changes are a bit confusing when aiming for backwards-compat. --- src/Language/Haskell/Brittany/Internal.hs | 4 ++-- stack-8.0.2.yaml | 2 +- stack-8.2.2.yaml | 2 +- stack.yaml | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Language/Haskell/Brittany/Internal.hs b/src/Language/Haskell/Brittany/Internal.hs index d839fa3..7e73081 100644 --- a/src/Language/Haskell/Brittany/Internal.hs +++ b/src/Language/Haskell/Brittany/Internal.hs @@ -432,7 +432,7 @@ parsePrintModuleTests conf filename input = do toLocal :: Config -> ExactPrint.Anns -> PPMLocal a -> PPM a toLocal conf anns m = do (x, write) <- lift $ MultiRWSS.runMultiRWSTAW (conf :+: anns :+: HNil) HNil $ m - MultiRWSS.mGetRawW >>= \w -> MultiRWSS.mPutRawW (w <> write) + MultiRWSS.mGetRawW >>= \w -> MultiRWSS.mPutRawW (w `mappend` write) pure x ppModule :: GenLocated SrcSpan (HsModule GhcPs) -> PPM () @@ -495,7 +495,7 @@ withTransformedAnns ast m = do in annsBalanced -getDeclBindingNames :: LHsDecl RdrName -> [String] +getDeclBindingNames :: LHsDecl GhcPs -> [String] getDeclBindingNames (L _ decl) = case decl of SigD (TypeSig ns _) -> ns <&> \(L _ n) -> Text.unpack (rdrNameToText n) ValD (FunBind (L _ n) _ _ _ _) -> [Text.unpack $ rdrNameToText n] diff --git a/stack-8.0.2.yaml b/stack-8.0.2.yaml index bdf7c39..849e301 100644 --- a/stack-8.0.2.yaml +++ b/stack-8.0.2.yaml @@ -3,7 +3,7 @@ resolver: lts-9.0 extra-deps: - monad-memo-0.4.1 - czipwith-1.0.1.0 - - butcher-1.3.1.0 + - butcher-1.3.1.1 - data-tree-print-0.1.0.0 - deque-0.2 - ghc-exactprint-0.5.6.0 diff --git a/stack-8.2.2.yaml b/stack-8.2.2.yaml index cbeba2e..b7f4c2b 100644 --- a/stack-8.2.2.yaml +++ b/stack-8.2.2.yaml @@ -2,7 +2,7 @@ resolver: lts-11.1 extra-deps: - czipwith-1.0.1.0 - - butcher-1.3.1.0 + - butcher-1.3.1.1 packages: - . diff --git a/stack.yaml b/stack.yaml index cbeba2e..b7f4c2b 100644 --- a/stack.yaml +++ b/stack.yaml @@ -2,7 +2,7 @@ resolver: lts-11.1 extra-deps: - czipwith-1.0.1.0 - - butcher-1.3.1.0 + - butcher-1.3.1.1 packages: - .