Merge pull request #12007 from haskell/monr1

Remove Distribution.Compat.Semigroup, derive via Generically instead

Author: mergify[bot]

Cabal-syntax/Cabal-syntax.cabal

@@ -75,7 +75,6 @@ library
     Distribution.Compat.NonEmptySet
     Distribution.Compat.Parsing
     Distribution.Compat.Prelude
-    Distribution.Compat.Semigroup
     Distribution.Compiler
     Distribution.FieldGrammar
     Distribution.FieldGrammar.Class

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

@@ -16,13 +16,12 @@ module Distribution.Compat.Prelude
 
     -- * Common type-classes
   , Semigroup (..)
-  , gmappend
-  , gmempty
   , Typeable
   , TypeRep
   , typeRep
   , Data
   , Generic
+  , Generically (..)
   , NFData (..)
   , Binary (..)
   , Structured
@@ -232,8 +231,7 @@ import Data.Typeable (TypeRep, Typeable, typeRep)
 import Data.Void (Void, absurd, vacuous)
 import Data.Word (Word, Word16, Word32, Word64, Word8)
 import Distribution.Compat.Binary (Binary (..))
-import Distribution.Compat.Semigroup (gmappend, gmempty)
-import GHC.Generics (Generic)
+import GHC.Generics (Generic, Generically (..))
 import System.Exit (ExitCode (..), exitFailure, exitSuccess, exitWith)
 import Text.Read (readMaybe)
 

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

@@ -204,7 +204,6 @@ library
     Distribution.Compat.NonEmptySet,
     Distribution.Compat.Parsing,
     Distribution.Compat.Prelude,
-    Distribution.Compat.Semigroup,
     Distribution.Compiler,
     Distribution.FieldGrammar,
     Distribution.FieldGrammar.Class,

Cabal/Cabal.cabal

@@ -7,8 +7,6 @@
 {-# LANGUAGE RankNTypes #-}
 {-# LANGUAGE ScopedTypeVariables #-}
 
------------------------------------------------------------------------------
-
 -- |
 -- Module      :  Distribution.Simple.GHC
 -- Copyright   :  Isaac Jones 2003-2007

Cabal/src/Distribution/Simple/GHC.hs

@@ -1,5 +1,6 @@
 {-# LANGUAGE DataKinds #-}
 {-# LANGUAGE DeriveGeneric #-}
+{-# LANGUAGE DerivingVia #-}
 {-# LANGUAGE DuplicateRecordFields #-}
 {-# LANGUAGE FlexibleContexts #-}
 {-# LANGUAGE LambdaCase #-}
@@ -156,6 +157,7 @@ data HaddockArgs = HaddockArgs
   -- ^ haddock's `--use-unicode` flag
   }
   deriving (Generic)
+  deriving (Semigroup, Monoid) via Generically HaddockArgs
 
 -- | The FilePath of a directory, it's a monoid under '(</>)'.
 newtype Directory = Dir {unDir' :: FilePath} deriving (Read, Show, Eq, Ord)
@@ -1638,12 +1640,6 @@ haddockToHscolour flags =
 
 -- ------------------------------------------------------------------------------
 -- Boilerplate Monoid instance.
-instance Monoid HaddockArgs where
-  mempty = gmempty
-
-instance Semigroup HaddockArgs where
-  (<>) = gmappend
-
 instance Monoid Directory where
   mempty = Dir "."
 

Cabal/src/Distribution/Simple/Haddock.hs

@@ -2,6 +2,7 @@
 {-# LANGUAGE CPP #-}
 {-# LANGUAGE DeriveFunctor #-}
 {-# LANGUAGE DeriveGeneric #-}
+{-# LANGUAGE DerivingVia #-}
 {-# LANGUAGE FlexibleContexts #-}
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE RankNTypes #-}
@@ -109,17 +110,12 @@ data InstallDirs dir = InstallDirs
   , sysconfdir :: dir
   }
   deriving (Eq, Read, Show, Functor, Generic)
+  deriving (Semigroup, Monoid) via Generically (InstallDirs dir)
 
 instance Binary dir => Binary (InstallDirs dir)
 instance NFData dir => NFData (InstallDirs dir)
 instance Structured dir => Structured (InstallDirs dir)
 
-instance Monoid dir => Monoid (InstallDirs dir) where
-  mempty = gmempty
-
-instance Semigroup dir => Semigroup (InstallDirs dir) where
-  (<>) = gmappend
-
 combineInstallDirs
   :: (a -> b -> c)
   -> InstallDirs a

Cabal/src/Distribution/Simple/InstallDirs.hs

@@ -1,5 +1,6 @@
 {-# LANGUAGE DataKinds #-}
 {-# LANGUAGE DeriveGeneric #-}
+{-# LANGUAGE DerivingVia #-}
 {-# LANGUAGE FlexibleContexts #-}
 {-# LANGUAGE LambdaCase #-}
 {-# LANGUAGE MultiWayIf #-}
@@ -608,6 +609,7 @@ data GhcOptions = GhcOptions
   -- Modifies some of the GHC error messages.
   }
   deriving (Show, Generic)
+  deriving (Semigroup, Monoid) via Generically GhcOptions
 
 data GhcMode
   = -- | @ghc -c@
@@ -1049,12 +1051,3 @@ splitRTSArgs args =
               then addRTSArg arg $ go isRTSArg rest
               else addNonRTSArg arg $ go isRTSArg rest
    in go False args
-
--- -----------------------------------------------------------------------------
--- Boilerplate Monoid instance for GhcOptions
-
-instance Monoid GhcOptions where
-  mempty = gmempty
-
-instance Semigroup GhcOptions where
-  (<>) = gmappend

Cabal/src/Distribution/Simple/Program/GHC.hs

@@ -1,5 +1,6 @@
 {-# LANGUAGE DataKinds #-}
 {-# LANGUAGE DeriveGeneric #-}
+{-# LANGUAGE DerivingVia #-}
 {-# LANGUAGE FlexibleContexts #-}
 {-# LANGUAGE PatternSynonyms #-}
 {-# LANGUAGE RankNTypes #-}
@@ -53,6 +54,7 @@ data BenchmarkFlags = BenchmarkFlags
   , benchmarkOptions :: [PathTemplate]
   }
   deriving (Show, Generic)
+  deriving (Semigroup, Monoid) via Generically BenchmarkFlags
 
 pattern BenchmarkCommonFlags
   :: Flag VerbosityFlags
@@ -148,9 +150,3 @@ benchmarkOptions' showOrParseArgs =
 
 emptyBenchmarkFlags :: BenchmarkFlags
 emptyBenchmarkFlags = mempty
-
-instance Monoid BenchmarkFlags where
-  mempty = gmempty
-
-instance Semigroup BenchmarkFlags where
-  (<>) = gmappend

Cabal/src/Distribution/Simple/Setup/Benchmark.hs

@@ -1,5 +1,6 @@
 {-# LANGUAGE DataKinds #-}
 {-# LANGUAGE DeriveGeneric #-}
+{-# LANGUAGE DerivingVia #-}
 {-# LANGUAGE FlexibleContexts #-}
 {-# LANGUAGE PatternSynonyms #-}
 {-# LANGUAGE RankNTypes #-}
@@ -59,6 +60,7 @@ data BuildFlags = BuildFlags
   , buildUseSemaphore :: Flag String
   }
   deriving (Read, Show, Generic)
+  deriving (Semigroup, Monoid) via Generically BuildFlags
 
 pattern BuildCommonFlags
   :: Flag VerbosityFlags
@@ -175,9 +177,3 @@ buildOptions progDb showOrParseArgs =
 
 emptyBuildFlags :: BuildFlags
 emptyBuildFlags = mempty
-
-instance Monoid BuildFlags where
-  mempty = gmempty
-
-instance Semigroup BuildFlags where
-  (<>) = gmappend