Fix some -Wcompat issues (MFP)

pull/5/head
Lennart Spitzner 2018-10-03 22:08:09 +02:00
parent 1eb489489d
commit c16eefdb0e
3 changed files with 7 additions and 6 deletions

View File

@ -93,7 +93,7 @@ instance Semigroup (Flag p) where
instance Monoid (Flag p) where instance Monoid (Flag p) where
mempty = Flag Nothing Nothing Visible mempty = Flag Nothing Nothing Visible
mappend = appendFlag mappend = (<>)
-- | Create a 'Flag' with just a help text. -- | Create a 'Flag' with just a help text.
flagHelp :: PP.Doc -> Flag p flagHelp :: PP.Doc -> Flag p

View File

@ -57,8 +57,8 @@ data Param p = Param
appendParam :: Param p -> Param p -> Param p appendParam :: Param p -> Param p -> Param p
appendParam (Param a1 b1 c1) (Param a2 b2 c2) = Param (a1 `f` a2) appendParam (Param a1 b1 c1) (Param a2 b2 c2) = Param (a1 `f` a2)
(b1 `mappend` b2) (b1 <> b2)
(c1 `mappend` c2) (c1 <> c2)
where where
f Nothing x = x f Nothing x = x
f x _ = x f x _ = x
@ -68,7 +68,7 @@ instance Semigroup (Param p) where
instance Monoid (Param p) where instance Monoid (Param p) where
mempty = Param Nothing Nothing Nothing mempty = Param Nothing Nothing Nothing
mappend = appendParam mappend = (<>)
-- | Create a 'Param' with just a help text. -- | Create a 'Param' with just a help text.
paramHelpStr :: String -> Param p paramHelpStr :: String -> Param p

View File

@ -337,8 +337,9 @@ import Debug.Trace ( trace
import Foreign.ForeignPtr ( ForeignPtr import Foreign.ForeignPtr ( ForeignPtr
) )
import Data.Monoid ( mconcat import Data.Monoid ( Monoid
, Monoid (..) , mempty
, mconcat
) )
import Data.Bifunctor ( bimap ) import Data.Bifunctor ( bimap )