Support GHC 8.4.1 by adding instance Semigroup ImportPortion

Author: gwils

lib/Language/Haskell/Stylish/Step/Imports.hs

@@ -22,9 +22,9 @@ import           Data.Char                       (toLower)
 import           Data.List                       (intercalate, sortBy)
 import qualified Data.Map                        as M
 import           Data.Maybe                      (isJust, maybeToList)
-import           Data.Monoid                     ((<>))
 import           Data.Ord                        (comparing)
 import qualified Data.Set                        as S
+import           Data.Semigroup                  (Semigroup ((<>)))
 import qualified Language.Haskell.Exts           as H
 
 
@@ -168,10 +168,13 @@ data ImportPortion l
   = ImportSome [H.CName l]  -- ^ @A(x, y, z)@
   | ImportAll               -- ^ @A(..)@
 
+instance Ord l => Semigroup (ImportPortion l) where
+  ImportSome a <> ImportSome b = ImportSome (setUnion a b)
+  _ <> _                       = ImportAll
+
 instance Ord l => Monoid (ImportPortion l) where
   mempty = ImportSome []
-  mappend (ImportSome a) (ImportSome b) = ImportSome (setUnion a b)
-  mappend _ _                           = ImportAll
+  mappend = (<>)
 
 -- | O(n log n) union.
 setUnion :: Ord a => [a] -> [a] -> [a]

stylish-haskell.cabal

@@ -57,6 +57,7 @@ Library
     file-embed       >= 0.0.10 && < 0.1,
     haskell-src-exts >= 1.18   && < 1.21,
     mtl              >= 2.0    && < 2.3,
+    semigroups       >= 0.18   && < 0.19,
     syb              >= 0.3    && < 0.8,
     yaml             >= 0.7    && < 0.9