Remove redundant -XCPP

- Remove redundant -XCPP from Cabal-tree-diff
- Remove redundant -XCPP from cabal-install
- Remove redundant -XCPP from Cabal
- Remove redundant -XCPP from Cabal-QuickCheck
- Remove redundant -XCPP from Cabal-syntax
- Remove redundant -XCPP from Cabal-tests
- Remove redundant -XCPP from cabal-testsuite

(cherry picked from commit 7965c7f)

# Conflicts:
#	Cabal-syntax/src/Distribution/Compat/Binary.hs
#	Cabal-syntax/src/Distribution/Utils/Generic.hs
#	cabal-install/src/Distribution/Client/CmdUpdate.hs
#	cabal-install/src/Distribution/Client/InstallSymlink.hs
#	cabal-install/src/Distribution/Client/Targets.hs

Cabal-QuickCheck/src/Test/QuickCheck/GenericArbitrary.hs

@@ -1,4 +1,3 @@
-{-# LANGUAGE CPP              #-}
 {-# LANGUAGE FlexibleContexts #-}
 {-# LANGUAGE GADTs            #-}
 {-# LANGUAGE TypeOperators #-}

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

@@ -1,6 +1,9 @@
+<<<<<<< HEAD
 {-# LANGUAGE CPP #-}
 {-# LANGUAGE PatternSynonyms #-}
 
+=======
+>>>>>>> 7965c7fce (Remove redundant -XCPP)
 module Distribution.Compat.Binary
   ( decodeOrFailIO
   , decodeFileOrFail'

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

@@ -1,5 +1,3 @@
-{-# LANGUAGE CPP #-}
-
 module Distribution.Compat.Exception
   ( catchIO
   , catchExit

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

@@ -1,15 +1,10 @@
 {-# LANGUAGE BangPatterns #-}
-{-# LANGUAGE CPP #-}
 {-# LANGUAGE FlexibleContexts #-}
 {-# LANGUAGE ScopedTypeVariables #-}
 {-# LANGUAGE TypeFamilies #-}
 {-# LANGUAGE TypeOperators #-}
 {-# LANGUAGE UndecidableInstances #-}
 
------------------------------------------------------------------------------
-
------------------------------------------------------------------------------
-
 -- |
 -- Module      :  Distribution.Compat.Graph
 -- Copyright   :  (c) Edward Z. Yang 2016

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

@@ -1,5 +1,3 @@
-{-# LANGUAGE CPP #-}
-
 -- | Compatibility layer for "Control.Monad.Fail"
 module Distribution.Compat.MonadFail (Control.Monad.Fail.MonadFail (fail)) where
 

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

@@ -1,4 +1,3 @@
-{-# LANGUAGE CPP #-}
 {-# LANGUAGE DefaultSignatures #-}
 {-# LANGUAGE FlexibleInstances #-}
 {-# LANGUAGE FunctionalDependencies #-}

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

@@ -1,4 +1,3 @@
-{-# LANGUAGE CPP #-}
 {-# LANGUAGE FlexibleContexts #-}
 {-# LANGUAGE RankNTypes #-}
 {-# LANGUAGE Trustworthy #-}

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

@@ -1,4 +1,3 @@
-{-# LANGUAGE CPP #-}
 {-# LANGUAGE DeriveGeneric #-}
 {-# LANGUAGE FlexibleContexts #-}
 {-# LANGUAGE GeneralizedNewtypeDeriving #-}

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

@@ -1,4 +1,3 @@
-{-# LANGUAGE CPP #-}
 {-# LANGUAGE ConstraintKinds #-}
 {-# LANGUAGE FunctionalDependencies #-}
 {-# LANGUAGE RankNTypes #-}

Cabal-syntax/src/Distribution/Fields/ParseResult.hs

@@ -1,5 +1,4 @@
 {-# LANGUAGE BangPatterns #-}
-{-# LANGUAGE CPP #-}
 {-# LANGUAGE FlexibleContexts #-}
 {-# LANGUAGE RankNTypes #-}
 

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

@@ -1,11 +1,8 @@
-{-# LANGUAGE CPP #-}
 {-# LANGUAGE FlexibleContexts #-}
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE Rank2Types #-}
 {-# LANGUAGE ScopedTypeVariables #-}
 
------------------------------------------------------------------------------
-
 -- |
 -- Module      :  Distribution.PackageDescription.Parsec
 -- Copyright   :  Isaac Jones 2003-2005

Cabal-syntax/src/Distribution/Parsec.hs

@@ -1,5 +1,4 @@
 {-# LANGUAGE BangPatterns #-}
-{-# LANGUAGE CPP #-}
 {-# LANGUAGE FlexibleContexts #-}
 {-# LANGUAGE GADTs #-}
 {-# LANGUAGE RankNTypes #-}

Cabal-syntax/src/Distribution/System.hs

@@ -1,10 +1,7 @@
-{-# LANGUAGE CPP #-}
 {-# LANGUAGE DeriveDataTypeable #-}
 {-# LANGUAGE DeriveGeneric #-}
 {-# LANGUAGE FlexibleContexts #-}
 
------------------------------------------------------------------------------
-
 -- |
 -- Module      :  Distribution.System
 -- Copyright   :  Duncan Coutts 2007-2008

Cabal-syntax/src/Distribution/Utils/Generic.hs

@@ -1,12 +1,13 @@
 {-# LANGUAGE BangPatterns #-}
+<<<<<<< HEAD
 {-# LANGUAGE CPP #-}
 {-# LANGUAGE DeriveGeneric #-}
+=======
+>>>>>>> 7965c7fce (Remove redundant -XCPP)
 {-# LANGUAGE FlexibleContexts #-}
 {-# LANGUAGE RankNTypes #-}
 {-# LANGUAGE ScopedTypeVariables #-}
 
------------------------------------------------------------------------------
-
 -- |
 -- Module      :  Distribution.Utils.Generic
 -- Copyright   :  Isaac Jones, Simon Marlow 2003-2004

Cabal-tests/tests/UnitTests/Distribution/CabalSpecVersion.hs

@@ -1,4 +1,3 @@
-{-# LANGUAGE CPP #-}
 {-# OPTIONS_GHC -fno-warn-deprecations #-}
 module UnitTests.Distribution.CabalSpecVersion (tests) where
 

Cabal-tests/tests/UnitTests/Distribution/Utils/CharSet.hs

@@ -1,4 +1,3 @@
-{-# LANGUAGE CPP #-}
 module UnitTests.Distribution.Utils.CharSet where
 
 import Prelude hiding (Foldable(..))

Cabal-tests/tests/UnitTests/Distribution/Utils/Structured.hs

@@ -1,4 +1,3 @@
-{-# LANGUAGE CPP #-}
 module UnitTests.Distribution.Utils.Structured (tests) where
 
 import Data.Proxy                    (Proxy (..))

Cabal-tree-diff/src/Data/TreeDiff/Instances/Cabal.hs

@@ -1,4 +1,3 @@
-{-# LANGUAGE CPP #-}
 {-# OPTIONS_GHC -freduction-depth=0 #-}
 {-# OPTIONS_GHC -fno-warn-orphans #-}
 module Data.TreeDiff.Instances.Cabal () where

Cabal-tree-diff/src/Data/TreeDiff/Instances/CabalLanguage.hs

@@ -1,4 +1,3 @@
-{-# LANGUAGE CPP #-}
 {-# OPTIONS_GHC -freduction-depth=0 #-}
 {-# OPTIONS_GHC -fno-warn-orphans #-}
 module Data.TreeDiff.Instances.CabalLanguage () where

Cabal-tree-diff/src/Data/TreeDiff/Instances/CabalSPDX.hs

@@ -1,4 +1,3 @@
-{-# LANGUAGE CPP #-}
 {-# OPTIONS_GHC -freduction-depth=0 #-}
 {-# OPTIONS_GHC -fno-warn-orphans #-}
 module Data.TreeDiff.Instances.CabalSPDX () where

Cabal-tree-diff/src/Data/TreeDiff/Instances/CabalVersion.hs

@@ -1,4 +1,3 @@
-{-# LANGUAGE CPP #-}
 {-# OPTIONS_GHC -freduction-depth=0 #-}
 {-# OPTIONS_GHC -fno-warn-orphans #-}
 module Data.TreeDiff.Instances.CabalVersion where

Cabal/src/Distribution/Compat/Async.hs

@@ -1,5 +1,3 @@
-{-# LANGUAGE CPP #-}
-
 -- | 'Async', yet using 'MVar's.
 --
 -- Adopted from @async@ library

Cabal/src/Distribution/Compat/ResponseFile.hs

@@ -1,4 +1,3 @@
-{-# LANGUAGE CPP #-}
 {-# LANGUAGE FlexibleContexts #-}
 {-# LANGUAGE RankNTypes #-}
 

Cabal/src/Distribution/Compat/Stack.hs

@@ -1,4 +1,3 @@
-{-# LANGUAGE CPP #-}
 {-# LANGUAGE ImplicitParams #-}
 {-# LANGUAGE RankNTypes #-}
 

Cabal/src/Distribution/Simple/GHCJS.hs

@@ -1,4 +1,3 @@
-{-# LANGUAGE CPP #-}
 {-# LANGUAGE DataKinds #-}
 {-# LANGUAGE FlexibleContexts #-}
 {-# LANGUAGE RankNTypes #-}

Cabal/src/Distribution/Simple/Setup.hs

@@ -1,13 +1,10 @@
-{-# LANGUAGE CPP #-}
 {-# LANGUAGE DataKinds #-}
 {-# LANGUAGE DeriveDataTypeable #-}
 {-# LANGUAGE DeriveGeneric #-}
 {-# LANGUAGE FlexibleContexts #-}
 {-# LANGUAGE LambdaCase #-}
 {-# LANGUAGE RankNTypes #-}
 
------------------------------------------------------------------------------
-
 -- |
 -- Module      :  Distribution.Simple.Setup
 -- Copyright   :  Isaac Jones 2003-2004

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

@@ -1,13 +1,10 @@
-{-# LANGUAGE CPP #-}
 {-# LANGUAGE DataKinds #-}
 {-# LANGUAGE DeriveGeneric #-}
 {-# LANGUAGE FlexibleContexts #-}
 {-# LANGUAGE PatternSynonyms #-}
 {-# LANGUAGE RankNTypes #-}
 {-# LANGUAGE ViewPatterns #-}
 
------------------------------------------------------------------------------
-
 -- |
 -- Module      :  Distribution.Simple.Benchmark
 -- Copyright   :  Isaac Jones 2003-2004

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

@@ -1,13 +1,10 @@
-{-# LANGUAGE CPP #-}
 {-# LANGUAGE DataKinds #-}
 {-# LANGUAGE DeriveGeneric #-}
 {-# LANGUAGE FlexibleContexts #-}
 {-# LANGUAGE PatternSynonyms #-}
 {-# LANGUAGE RankNTypes #-}
 {-# LANGUAGE ViewPatterns #-}
 
------------------------------------------------------------------------------
-
 -- |
 -- Module      :  Distribution.Simple.Setup.Build
 -- Copyright   :  Isaac Jones 2003-2004

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

@@ -1,13 +1,10 @@
-{-# LANGUAGE CPP #-}
 {-# LANGUAGE DataKinds #-}
 {-# LANGUAGE DeriveGeneric #-}
 {-# LANGUAGE FlexibleContexts #-}
 {-# LANGUAGE PatternSynonyms #-}
 {-# LANGUAGE RankNTypes #-}
 {-# LANGUAGE ViewPatterns #-}
 
------------------------------------------------------------------------------
-
 -- |
 -- Module      :  Distribution.Simple.Setup.Clean
 -- Copyright   :  Isaac Jones 2003-2004

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

@@ -1,13 +1,10 @@
-{-# LANGUAGE CPP #-}
 {-# LANGUAGE DataKinds #-}
 {-# LANGUAGE DeriveDataTypeable #-}
 {-# LANGUAGE DeriveGeneric #-}
 {-# LANGUAGE DeriveTraversable #-}
 {-# LANGUAGE FlexibleContexts #-}
 {-# LANGUAGE RankNTypes #-}
 
------------------------------------------------------------------------------
-
 -- |
 -- Module      :  Distribution.Simple.Setup.Common
 -- Copyright   :  Isaac Jones 2003-2004

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

@@ -1,4 +1,3 @@
-{-# LANGUAGE CPP #-}
 {-# LANGUAGE DataKinds #-}
 {-# LANGUAGE DeriveDataTypeable #-}
 {-# LANGUAGE DeriveGeneric #-}
@@ -7,8 +6,6 @@
 {-# LANGUAGE RankNTypes #-}
 {-# LANGUAGE ViewPatterns #-}
 
------------------------------------------------------------------------------
-
 -- |
 -- Module      :  Distribution.Simple.Setup.Copy
 -- Copyright   :  Isaac Jones 2003-2004

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

@@ -1,11 +1,8 @@
-{-# LANGUAGE CPP #-}
 {-# LANGUAGE DataKinds #-}
 {-# LANGUAGE DeriveGeneric #-}
 {-# LANGUAGE FlexibleContexts #-}
 {-# LANGUAGE RankNTypes #-}
 
------------------------------------------------------------------------------
-
 -- |
 -- Module      :  Distribution.Simple.Setup.Global
 -- Copyright   :  Isaac Jones 2003-2004

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

@@ -1,13 +1,10 @@
-{-# LANGUAGE CPP #-}
 {-# LANGUAGE DataKinds #-}
 {-# LANGUAGE DeriveGeneric #-}
 {-# LANGUAGE FlexibleContexts #-}
 {-# LANGUAGE PatternSynonyms #-}
 {-# LANGUAGE RankNTypes #-}
 {-# LANGUAGE ViewPatterns #-}
 
------------------------------------------------------------------------------
-
 -- |
 -- Module      :  Distribution.Simple.Setup.Haddock
 -- Copyright   :  Isaac Jones 2003-2004

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

@@ -1,13 +1,10 @@
-{-# LANGUAGE CPP #-}
 {-# LANGUAGE DataKinds #-}
 {-# LANGUAGE DeriveGeneric #-}
 {-# LANGUAGE FlexibleContexts #-}
 {-# LANGUAGE PatternSynonyms #-}
 {-# LANGUAGE RankNTypes #-}
 {-# LANGUAGE ViewPatterns #-}
 
------------------------------------------------------------------------------
-
 -- |
 -- Module      :  Distribution.Simple.Setup.Hscolour
 -- Copyright   :  Isaac Jones 2003-2004

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

@@ -1,4 +1,3 @@
-{-# LANGUAGE CPP #-}
 {-# LANGUAGE DataKinds #-}
 {-# LANGUAGE DeriveDataTypeable #-}
 {-# LANGUAGE DeriveGeneric #-}
@@ -7,8 +6,6 @@
 {-# LANGUAGE RankNTypes #-}
 {-# LANGUAGE ViewPatterns #-}
 
------------------------------------------------------------------------------
-
 -- |
 -- Module      :  Distribution.Simple.Setup.Install
 -- Copyright   :  Isaac Jones 2003-2004

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

@@ -1,13 +1,10 @@
-{-# LANGUAGE CPP #-}
 {-# LANGUAGE DataKinds #-}
 {-# LANGUAGE DeriveGeneric #-}
 {-# LANGUAGE FlexibleContexts #-}
 {-# LANGUAGE PatternSynonyms #-}
 {-# LANGUAGE RankNTypes #-}
 {-# LANGUAGE ViewPatterns #-}
 
------------------------------------------------------------------------------
-
 -- |
 -- Module      :  Distribution.Simple.Setup.Register
 -- Copyright   :  Isaac Jones 2003-2004

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

@@ -1,13 +1,10 @@
-{-# LANGUAGE CPP #-}
 {-# LANGUAGE DataKinds #-}
 {-# LANGUAGE DeriveGeneric #-}
 {-# LANGUAGE FlexibleContexts #-}
 {-# LANGUAGE PatternSynonyms #-}
 {-# LANGUAGE RankNTypes #-}
 {-# LANGUAGE ViewPatterns #-}
 
------------------------------------------------------------------------------
-
 -- |
 -- Module      :  Distribution.Simple.Setup.Repl
 -- Copyright   :  Isaac Jones 2003-2004

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

@@ -1,13 +1,10 @@
-{-# LANGUAGE CPP #-}
 {-# LANGUAGE DataKinds #-}
 {-# LANGUAGE DeriveGeneric #-}
 {-# LANGUAGE FlexibleContexts #-}
 {-# LANGUAGE PatternSynonyms #-}
 {-# LANGUAGE RankNTypes #-}
 {-# LANGUAGE ViewPatterns #-}
 
------------------------------------------------------------------------------
-
 -- |
 -- Module      :  Distribution.Simple.Setup.SDist
 -- Copyright   :  Isaac Jones 2003-2004

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

@@ -1,13 +1,10 @@
-{-# LANGUAGE CPP #-}
 {-# LANGUAGE DataKinds #-}
 {-# LANGUAGE DeriveGeneric #-}
 {-# LANGUAGE FlexibleContexts #-}
 {-# LANGUAGE PatternSynonyms #-}
 {-# LANGUAGE RankNTypes #-}
 {-# LANGUAGE ViewPatterns #-}
 
------------------------------------------------------------------------------
-
 -- |
 -- Module      :  Distribution.Simple.Test
 -- Copyright   :  Isaac Jones 2003-2004

Cabal/src/Distribution/Utils/MapAccum.hs

@@ -1,5 +1,3 @@
-{-# LANGUAGE CPP #-}
-
 module Distribution.Utils.MapAccum (mapAccumM) where
 
 import Distribution.Compat.Prelude

Cabal/src/Distribution/Utils/Progress.hs

@@ -1,4 +1,3 @@
-{-# LANGUAGE CPP #-}
 {-# LANGUAGE DeriveFunctor #-}
 
 -- Note: This module was copied from cabal-install.

cabal-install/src/Distribution/Client/Check.hs

@@ -1,9 +1,3 @@
-{-# LANGUAGE CPP #-}
-
------------------------------------------------------------------------------
-
------------------------------------------------------------------------------
-
 -- |
 -- Module      :  Distribution.Client.Check
 -- Copyright   :  (c) Lennart Kolmodin 2008

cabal-install/src/Distribution/Client/CmdOutdated.hs

@@ -1,11 +1,6 @@
-{-# LANGUAGE CPP #-}
 {-# LANGUAGE NamedFieldPuns #-}
 {-# LANGUAGE RecordWildCards #-}
 
------------------------------------------------------------------------------
-
------------------------------------------------------------------------------
-
 -- |
 -- Module      :  Distribution.Client.CmdOutdated
 -- Maintainer  :  [email protected]