From c16eefdb0eb09ab1326a5dacb14549dd84d7b2e6 Mon Sep 17 00:00:00 2001
From: Lennart Spitzner <hexagoxel@hexagoxel.de>
Date: Wed, 3 Oct 2018 22:08:09 +0200
Subject: [PATCH] Fix some -Wcompat issues (MFP)

---
 src/UI/Butcher/Monadic/Flag.hs  | 2 +-
 src/UI/Butcher/Monadic/Param.hs | 6 +++---
 srcinc/prelude.inc              | 5 +++--
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/UI/Butcher/Monadic/Flag.hs b/src/UI/Butcher/Monadic/Flag.hs
index 25fa69d..fb1435e 100644
--- a/src/UI/Butcher/Monadic/Flag.hs
+++ b/src/UI/Butcher/Monadic/Flag.hs
@@ -93,7 +93,7 @@ instance Semigroup (Flag p) where
 
 instance Monoid (Flag p) where
   mempty = Flag Nothing Nothing Visible
-  mappend = appendFlag
+  mappend = (<>)
 
 -- | Create a 'Flag' with just a help text.
 flagHelp :: PP.Doc -> Flag p
diff --git a/src/UI/Butcher/Monadic/Param.hs b/src/UI/Butcher/Monadic/Param.hs
index 747224c..3274ce5 100644
--- a/src/UI/Butcher/Monadic/Param.hs
+++ b/src/UI/Butcher/Monadic/Param.hs
@@ -57,8 +57,8 @@ data Param p = Param
 
 appendParam :: Param p -> Param p -> Param p
 appendParam (Param a1 b1 c1) (Param a2 b2 c2) = Param (a1 `f` a2)
-                                                      (b1 `mappend` b2)
-                                                      (c1 `mappend` c2)
+                                                      (b1 <> b2)
+                                                      (c1 <> c2)
  where
   f Nothing x = x
   f x       _ = x
@@ -68,7 +68,7 @@ instance Semigroup (Param p) where
 
 instance Monoid (Param p) where
   mempty = Param Nothing Nothing Nothing
-  mappend = appendParam
+  mappend = (<>)
 
 -- | Create a 'Param' with just a help text.
 paramHelpStr :: String -> Param p
diff --git a/srcinc/prelude.inc b/srcinc/prelude.inc
index 439a040..ad7f5ca 100644
--- a/srcinc/prelude.inc
+++ b/srcinc/prelude.inc
@@ -337,8 +337,9 @@ import Debug.Trace                        ( trace
 import Foreign.ForeignPtr                 ( ForeignPtr
                                           )
 
-import Data.Monoid                        ( mconcat
-                                          , Monoid (..)
+import Data.Monoid                        ( Monoid
+                                          , mempty
+                                          , mconcat
                                           )
 
 import Data.Bifunctor                     ( bimap )