Monoid of no Mappend

Author: Bodigrim

Cabal-described/src/Distribution/Utils/CharSet.hs

@@ -61,7 +61,6 @@ instance Semigroup CharSet where
 
 instance Monoid CharSet where
     mempty = empty
-    mappend = (<>)
 
 -- | Empty character set.
 empty :: CharSet

Cabal-described/src/Distribution/Utils/GrammarRegex.hs

@@ -77,7 +77,6 @@ instance Semigroup (GrammarRegex a) where
 
 instance Monoid (GrammarRegex a) where
     mempty = REAppend []
-    mappend = (<>)
 
 -------------------------------------------------------------------------------
 -- Smart constructors

Cabal-syntax/src/Distribution/Compat/DList.hs

@@ -48,7 +48,6 @@ snoc xs x = xs <> singleton x
 
 instance Monoid (DList a) where
   mempty = empty
-  mappend = (<>)
 
 instance Semigroup (DList a) where
   DList a <> DList b = DList (a . b)

Cabal-syntax/src/Distribution/Compiler.hs

@@ -164,7 +164,6 @@ instance Semigroup a => Semigroup (PerCompilerFlavor a) where
 
 instance Monoid a => Monoid (PerCompilerFlavor a) where
   mempty = PerCompilerFlavor mempty mempty
-  mappend = (<>)
 
 -- ------------------------------------------------------------
 

Cabal-syntax/src/Distribution/FieldGrammar/Class.hs

@@ -121,7 +121,7 @@ class
 
   -- | Monoidal field.
   --
-  -- Values are combined with 'mappend'.
+  -- Values are combined with '(<>)'.
   --
   -- /Note:/ 'optionalFieldAla' is a @monoidalField@ with 'Last' monoid.
   monoidalFieldAla
@@ -221,7 +221,7 @@ optionalFieldDef
   -> g s a
 optionalFieldDef fn l x = optionalFieldDefAla fn Identity l x
 
--- | Field which can be define multiple times, and the results are @mappend@ed.
+-- | Field which can be define multiple times, and the results are combined with '(<>)'.
 monoidalField
   :: (FieldGrammar c g, c (Identity a), Monoid a)
   => FieldName

Cabal-syntax/src/Distribution/FieldGrammar/FieldDescrs.hs

@@ -38,7 +38,7 @@ newtype FieldDescrs s a = F {runF :: Map P.FieldName (SP s)}
 
 instance Applicative (FieldDescrs s) where
   pure _ = F mempty
-  f <*> x = F (mappend (runF f) (runF x))
+  f <*> x = F (runF f <> runF x)
 
 singletonF :: P.FieldName -> (s -> Disp.Doc) -> (forall m. P.CabalParsing m => s -> m s) -> FieldDescrs s a
 singletonF fn f g = F $ Map.singleton fn (SP f g)
@@ -102,7 +102,7 @@ instance FieldGrammar ParsecPretty FieldDescrs where
   monoidalFieldAla fn _pack l = singletonF fn f g
     where
       f s = pretty (pack' _pack (aview l s))
-      g s = cloneLens l (\x -> mappend x . unpack' _pack <$> P.parsec) s
+      g s = cloneLens l (\x -> (x <>) . unpack' _pack <$> P.parsec) s
 
   prefixedFields _fnPfx _l = F mempty
   knownField _ = pure ()

Cabal-syntax/src/Distribution/FieldGrammar/Parsec.hs

@@ -154,8 +154,8 @@ instance Applicative (ParsecFieldGrammar s) where
 
   ParsecFG f f' f'' <*> ParsecFG x x' x'' =
     ParsecFG
-      (mappend f x)
-      (mappend f' x')
+      (f <> x)
+      (f' <> x')
       (\v fields -> f'' v fields <*> x'' v fields)
   {-# INLINE (<*>) #-}
 

Cabal-syntax/src/Distribution/PackageDescription/Configuration.hs

@@ -155,7 +155,6 @@ data DepTestRslt
 
 instance Monoid DepTestRslt where
   mempty = DepOk
-  mappend = (<>)
 
 instance Semigroup DepTestRslt where
   DepOk <> x = x
@@ -402,7 +401,6 @@ data PDTagged
 
 instance Monoid PDTagged where
   mempty = PDNull
-  mappend = (<>)
 
 instance Semigroup PDTagged where
   PDNull <> x = x

Cabal-syntax/src/Distribution/PackageDescription/Parsec.hs

@@ -717,10 +717,10 @@ onAllBranches p = go mempty
     -- done. If not, then one of the conditional branches below the current node
     -- must satisfy it. Each node may have multiple immediate children; we only
     -- one need one to satisfy the property because the configure step uses
-    -- 'mappend' to join together the results of flag resolution.
+    -- '(<>)' to join together the results of flag resolution.
     go :: a -> CondTree v a -> Bool
     go acc ct =
-      let acc' = acc `mappend` condTreeData ct
+      let acc' = acc <> condTreeData ct
        in p acc' || any (goBranch acc') (condTreeComponents ct)
 
     -- Both the 'true' and the 'false' block must satisfy the property.

Cabal-syntax/src/Distribution/Types/Benchmark.hs

@@ -43,7 +43,6 @@ instance Monoid Benchmark where
       , benchmarkInterface = mempty
       , benchmarkBuildInfo = mempty
       }
-  mappend = (<>)
 
 instance Semigroup Benchmark where
   a <> b =
@@ -53,7 +52,7 @@ instance Semigroup Benchmark where
       , benchmarkBuildInfo = combine benchmarkBuildInfo
       }
     where
-      combine field = field a `mappend` field b
+      combine field = field a <> field b
 
 emptyBenchmark :: Benchmark
 emptyBenchmark = mempty