From 7965c7fce1da968c02bce88ac60f90cffa83a336 Mon Sep 17 00:00:00 2001 From: Phil de Joux Date: Mon, 6 Jan 2025 14:31:20 -0500 Subject: [PATCH] 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 --- Cabal-QuickCheck/src/Test/QuickCheck/GenericArbitrary.hs | 1 - Cabal-syntax/src/Distribution/Compat/Binary.hs | 2 -- Cabal-syntax/src/Distribution/Compat/Exception.hs | 2 -- Cabal-syntax/src/Distribution/Compat/Graph.hs | 5 ----- Cabal-syntax/src/Distribution/Compat/MonadFail.hs | 2 -- Cabal-syntax/src/Distribution/Compat/Newtype.hs | 1 - Cabal-syntax/src/Distribution/Compat/Prelude.hs | 1 - Cabal-syntax/src/Distribution/Compat/Semigroup.hs | 1 - Cabal-syntax/src/Distribution/FieldGrammar/Class.hs | 1 - Cabal-syntax/src/Distribution/Fields/ParseResult.hs | 1 - Cabal-syntax/src/Distribution/PackageDescription/Parsec.hs | 3 --- Cabal-syntax/src/Distribution/Parsec.hs | 1 - Cabal-syntax/src/Distribution/System.hs | 3 --- Cabal-syntax/src/Distribution/Utils/Generic.hs | 3 --- .../tests/UnitTests/Distribution/CabalSpecVersion.hs | 1 - Cabal-tests/tests/UnitTests/Distribution/Utils/CharSet.hs | 1 - .../tests/UnitTests/Distribution/Utils/Structured.hs | 1 - Cabal-tree-diff/src/Data/TreeDiff/Instances/Cabal.hs | 1 - .../src/Data/TreeDiff/Instances/CabalLanguage.hs | 1 - Cabal-tree-diff/src/Data/TreeDiff/Instances/CabalSPDX.hs | 1 - Cabal-tree-diff/src/Data/TreeDiff/Instances/CabalVersion.hs | 1 - Cabal/src/Distribution/Compat/Async.hs | 2 -- Cabal/src/Distribution/Compat/ResponseFile.hs | 1 - Cabal/src/Distribution/Compat/Stack.hs | 1 - Cabal/src/Distribution/Simple/GHCJS.hs | 1 - Cabal/src/Distribution/Simple/Setup.hs | 3 --- Cabal/src/Distribution/Simple/Setup/Benchmark.hs | 3 --- Cabal/src/Distribution/Simple/Setup/Build.hs | 3 --- Cabal/src/Distribution/Simple/Setup/Clean.hs | 3 --- Cabal/src/Distribution/Simple/Setup/Common.hs | 3 --- Cabal/src/Distribution/Simple/Setup/Copy.hs | 3 --- Cabal/src/Distribution/Simple/Setup/Global.hs | 3 --- Cabal/src/Distribution/Simple/Setup/Haddock.hs | 3 --- Cabal/src/Distribution/Simple/Setup/Hscolour.hs | 3 --- Cabal/src/Distribution/Simple/Setup/Install.hs | 3 --- Cabal/src/Distribution/Simple/Setup/Register.hs | 3 --- Cabal/src/Distribution/Simple/Setup/Repl.hs | 3 --- Cabal/src/Distribution/Simple/Setup/SDist.hs | 3 --- Cabal/src/Distribution/Simple/Setup/Test.hs | 3 --- Cabal/src/Distribution/Utils/MapAccum.hs | 2 -- Cabal/src/Distribution/Utils/Progress.hs | 1 - cabal-install/src/Distribution/Client/Check.hs | 6 ------ cabal-install/src/Distribution/Client/CmdOutdated.hs | 5 ----- cabal-install/src/Distribution/Client/CmdPath.hs | 5 ----- cabal-install/src/Distribution/Client/CmdUpdate.hs | 1 - cabal-install/src/Distribution/Client/Configure.hs | 5 ----- cabal-install/src/Distribution/Client/FileMonitor.hs | 1 - cabal-install/src/Distribution/Client/GenBounds.hs | 6 ------ cabal-install/src/Distribution/Client/IndexUtils.hs | 5 ----- cabal-install/src/Distribution/Client/InstallSymlink.hs | 5 ----- cabal-install/src/Distribution/Client/Main.hs | 5 ----- cabal-install/src/Distribution/Client/Manpage.hs | 4 ---- cabal-install/src/Distribution/Client/ProjectBuilding.hs | 1 - cabal-install/src/Distribution/Client/ProjectConfig.hs | 1 - cabal-install/src/Distribution/Client/Sandbox.hs | 5 ----- cabal-install/src/Distribution/Client/Security/HTTP.hs | 1 - cabal-install/src/Distribution/Client/Targets.hs | 5 ----- cabal-install/src/Distribution/Deprecated/ParseUtils.hs | 1 - cabal-install/src/Distribution/Deprecated/ReadP.hs | 5 ----- .../tests/UnitTests/Distribution/Client/FileMonitor.hs | 2 -- cabal-install/tests/UnitTests/Distribution/Client/Glob.hs | 1 - .../tests/UnitTests/Distribution/Client/UserConfig.hs | 2 -- .../UnitTests/Distribution/Solver/Modular/QuickCheck.hs | 1 - .../UnitTests/Distribution/Solver/Types/OptionalStanza.hs | 2 -- cabal-testsuite/main/cabal-tests.hs | 1 - cabal-testsuite/src/Test/Cabal/TestCode.hs | 1 - 66 files changed, 161 deletions(-) diff --git a/Cabal-QuickCheck/src/Test/QuickCheck/GenericArbitrary.hs b/Cabal-QuickCheck/src/Test/QuickCheck/GenericArbitrary.hs index 29f0b5d85e9..0a9f92be693 100644 --- a/Cabal-QuickCheck/src/Test/QuickCheck/GenericArbitrary.hs +++ b/Cabal-QuickCheck/src/Test/QuickCheck/GenericArbitrary.hs @@ -1,4 +1,3 @@ -{-# LANGUAGE CPP #-} {-# LANGUAGE FlexibleContexts #-} {-# LANGUAGE GADTs #-} {-# LANGUAGE TypeOperators #-} diff --git a/Cabal-syntax/src/Distribution/Compat/Binary.hs b/Cabal-syntax/src/Distribution/Compat/Binary.hs index 563337333ff..ffb1c987e6f 100644 --- a/Cabal-syntax/src/Distribution/Compat/Binary.hs +++ b/Cabal-syntax/src/Distribution/Compat/Binary.hs @@ -1,5 +1,3 @@ -{-# LANGUAGE CPP #-} - module Distribution.Compat.Binary ( decodeOrFailIO , decodeFileOrFail' diff --git a/Cabal-syntax/src/Distribution/Compat/Exception.hs b/Cabal-syntax/src/Distribution/Compat/Exception.hs index e2a9419e5a5..048ef25158b 100644 --- a/Cabal-syntax/src/Distribution/Compat/Exception.hs +++ b/Cabal-syntax/src/Distribution/Compat/Exception.hs @@ -1,5 +1,3 @@ -{-# LANGUAGE CPP #-} - module Distribution.Compat.Exception ( catchIO , catchExit diff --git a/Cabal-syntax/src/Distribution/Compat/Graph.hs b/Cabal-syntax/src/Distribution/Compat/Graph.hs index 792cc47ce5f..c716563f52a 100644 --- a/Cabal-syntax/src/Distribution/Compat/Graph.hs +++ b/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 diff --git a/Cabal-syntax/src/Distribution/Compat/MonadFail.hs b/Cabal-syntax/src/Distribution/Compat/MonadFail.hs index 3516aef7e77..4185bca592f 100644 --- a/Cabal-syntax/src/Distribution/Compat/MonadFail.hs +++ b/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 diff --git a/Cabal-syntax/src/Distribution/Compat/Newtype.hs b/Cabal-syntax/src/Distribution/Compat/Newtype.hs index 56f55a9282b..c4275bed305 100644 --- a/Cabal-syntax/src/Distribution/Compat/Newtype.hs +++ b/Cabal-syntax/src/Distribution/Compat/Newtype.hs @@ -1,4 +1,3 @@ -{-# LANGUAGE CPP #-} {-# LANGUAGE DefaultSignatures #-} {-# LANGUAGE FlexibleInstances #-} {-# LANGUAGE FunctionalDependencies #-} diff --git a/Cabal-syntax/src/Distribution/Compat/Prelude.hs b/Cabal-syntax/src/Distribution/Compat/Prelude.hs index 2d6f92b5da6..59401b5d00e 100644 --- a/Cabal-syntax/src/Distribution/Compat/Prelude.hs +++ b/Cabal-syntax/src/Distribution/Compat/Prelude.hs @@ -1,4 +1,3 @@ -{-# LANGUAGE CPP #-} {-# LANGUAGE FlexibleContexts #-} {-# LANGUAGE RankNTypes #-} {-# LANGUAGE Trustworthy #-} diff --git a/Cabal-syntax/src/Distribution/Compat/Semigroup.hs b/Cabal-syntax/src/Distribution/Compat/Semigroup.hs index 9ebc7f0f7f4..679cabb69e2 100644 --- a/Cabal-syntax/src/Distribution/Compat/Semigroup.hs +++ b/Cabal-syntax/src/Distribution/Compat/Semigroup.hs @@ -1,4 +1,3 @@ -{-# LANGUAGE CPP #-} {-# LANGUAGE DeriveGeneric #-} {-# LANGUAGE FlexibleContexts #-} {-# LANGUAGE GeneralizedNewtypeDeriving #-} diff --git a/Cabal-syntax/src/Distribution/FieldGrammar/Class.hs b/Cabal-syntax/src/Distribution/FieldGrammar/Class.hs index df8b69414f2..fa815a49a5e 100644 --- a/Cabal-syntax/src/Distribution/FieldGrammar/Class.hs +++ b/Cabal-syntax/src/Distribution/FieldGrammar/Class.hs @@ -1,4 +1,3 @@ -{-# LANGUAGE CPP #-} {-# LANGUAGE ConstraintKinds #-} {-# LANGUAGE FunctionalDependencies #-} {-# LANGUAGE RankNTypes #-} diff --git a/Cabal-syntax/src/Distribution/Fields/ParseResult.hs b/Cabal-syntax/src/Distribution/Fields/ParseResult.hs index aad7de2737a..912ea7fb02f 100644 --- a/Cabal-syntax/src/Distribution/Fields/ParseResult.hs +++ b/Cabal-syntax/src/Distribution/Fields/ParseResult.hs @@ -1,5 +1,4 @@ {-# LANGUAGE BangPatterns #-} -{-# LANGUAGE CPP #-} {-# LANGUAGE FlexibleContexts #-} {-# LANGUAGE RankNTypes #-} diff --git a/Cabal-syntax/src/Distribution/PackageDescription/Parsec.hs b/Cabal-syntax/src/Distribution/PackageDescription/Parsec.hs index e9fced4f770..92256c98be5 100644 --- a/Cabal-syntax/src/Distribution/PackageDescription/Parsec.hs +++ b/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 diff --git a/Cabal-syntax/src/Distribution/Parsec.hs b/Cabal-syntax/src/Distribution/Parsec.hs index 3bf62597222..d0197616fd6 100644 --- a/Cabal-syntax/src/Distribution/Parsec.hs +++ b/Cabal-syntax/src/Distribution/Parsec.hs @@ -1,5 +1,4 @@ {-# LANGUAGE BangPatterns #-} -{-# LANGUAGE CPP #-} {-# LANGUAGE FlexibleContexts #-} {-# LANGUAGE GADTs #-} {-# LANGUAGE RankNTypes #-} diff --git a/Cabal-syntax/src/Distribution/System.hs b/Cabal-syntax/src/Distribution/System.hs index 1903ae40fc8..78a9b3819c9 100644 --- a/Cabal-syntax/src/Distribution/System.hs +++ b/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 diff --git a/Cabal-syntax/src/Distribution/Utils/Generic.hs b/Cabal-syntax/src/Distribution/Utils/Generic.hs index 30cf8f7d75a..cc609d12642 100644 --- a/Cabal-syntax/src/Distribution/Utils/Generic.hs +++ b/Cabal-syntax/src/Distribution/Utils/Generic.hs @@ -1,11 +1,8 @@ {-# LANGUAGE BangPatterns #-} -{-# LANGUAGE CPP #-} {-# LANGUAGE FlexibleContexts #-} {-# LANGUAGE RankNTypes #-} {-# LANGUAGE ScopedTypeVariables #-} ------------------------------------------------------------------------------ - -- | -- Module : Distribution.Utils.Generic -- Copyright : Isaac Jones, Simon Marlow 2003-2004 diff --git a/Cabal-tests/tests/UnitTests/Distribution/CabalSpecVersion.hs b/Cabal-tests/tests/UnitTests/Distribution/CabalSpecVersion.hs index 52fb5c7a689..2a23d3d23f1 100644 --- a/Cabal-tests/tests/UnitTests/Distribution/CabalSpecVersion.hs +++ b/Cabal-tests/tests/UnitTests/Distribution/CabalSpecVersion.hs @@ -1,4 +1,3 @@ -{-# LANGUAGE CPP #-} {-# OPTIONS_GHC -fno-warn-deprecations #-} module UnitTests.Distribution.CabalSpecVersion (tests) where diff --git a/Cabal-tests/tests/UnitTests/Distribution/Utils/CharSet.hs b/Cabal-tests/tests/UnitTests/Distribution/Utils/CharSet.hs index a7d629ccb08..9efa58cc672 100644 --- a/Cabal-tests/tests/UnitTests/Distribution/Utils/CharSet.hs +++ b/Cabal-tests/tests/UnitTests/Distribution/Utils/CharSet.hs @@ -1,4 +1,3 @@ -{-# LANGUAGE CPP #-} module UnitTests.Distribution.Utils.CharSet where import Prelude hiding (Foldable(..)) diff --git a/Cabal-tests/tests/UnitTests/Distribution/Utils/Structured.hs b/Cabal-tests/tests/UnitTests/Distribution/Utils/Structured.hs index 7daee1b53f8..47a0cc1bd2c 100644 --- a/Cabal-tests/tests/UnitTests/Distribution/Utils/Structured.hs +++ b/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 (..)) diff --git a/Cabal-tree-diff/src/Data/TreeDiff/Instances/Cabal.hs b/Cabal-tree-diff/src/Data/TreeDiff/Instances/Cabal.hs index 15fae62649e..a63faa3510c 100644 --- a/Cabal-tree-diff/src/Data/TreeDiff/Instances/Cabal.hs +++ b/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 diff --git a/Cabal-tree-diff/src/Data/TreeDiff/Instances/CabalLanguage.hs b/Cabal-tree-diff/src/Data/TreeDiff/Instances/CabalLanguage.hs index 78f6a7e5aa8..194ea34df80 100644 --- a/Cabal-tree-diff/src/Data/TreeDiff/Instances/CabalLanguage.hs +++ b/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 diff --git a/Cabal-tree-diff/src/Data/TreeDiff/Instances/CabalSPDX.hs b/Cabal-tree-diff/src/Data/TreeDiff/Instances/CabalSPDX.hs index 2926129cb3d..520cbf8c894 100644 --- a/Cabal-tree-diff/src/Data/TreeDiff/Instances/CabalSPDX.hs +++ b/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 diff --git a/Cabal-tree-diff/src/Data/TreeDiff/Instances/CabalVersion.hs b/Cabal-tree-diff/src/Data/TreeDiff/Instances/CabalVersion.hs index 3c2ac454dde..4321fd0bc3d 100644 --- a/Cabal-tree-diff/src/Data/TreeDiff/Instances/CabalVersion.hs +++ b/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 diff --git a/Cabal/src/Distribution/Compat/Async.hs b/Cabal/src/Distribution/Compat/Async.hs index c0052b01185..7615a29a176 100644 --- a/Cabal/src/Distribution/Compat/Async.hs +++ b/Cabal/src/Distribution/Compat/Async.hs @@ -1,5 +1,3 @@ -{-# LANGUAGE CPP #-} - -- | 'Async', yet using 'MVar's. -- -- Adopted from @async@ library diff --git a/Cabal/src/Distribution/Compat/ResponseFile.hs b/Cabal/src/Distribution/Compat/ResponseFile.hs index 8619ae56962..568e659c094 100644 --- a/Cabal/src/Distribution/Compat/ResponseFile.hs +++ b/Cabal/src/Distribution/Compat/ResponseFile.hs @@ -1,4 +1,3 @@ -{-# LANGUAGE CPP #-} {-# LANGUAGE FlexibleContexts #-} {-# LANGUAGE RankNTypes #-} diff --git a/Cabal/src/Distribution/Compat/Stack.hs b/Cabal/src/Distribution/Compat/Stack.hs index 616a66d090d..425e53a990e 100644 --- a/Cabal/src/Distribution/Compat/Stack.hs +++ b/Cabal/src/Distribution/Compat/Stack.hs @@ -1,4 +1,3 @@ -{-# LANGUAGE CPP #-} {-# LANGUAGE ImplicitParams #-} {-# LANGUAGE RankNTypes #-} diff --git a/Cabal/src/Distribution/Simple/GHCJS.hs b/Cabal/src/Distribution/Simple/GHCJS.hs index eb8400f7f37..ca71857828e 100644 --- a/Cabal/src/Distribution/Simple/GHCJS.hs +++ b/Cabal/src/Distribution/Simple/GHCJS.hs @@ -1,4 +1,3 @@ -{-# LANGUAGE CPP #-} {-# LANGUAGE DataKinds #-} {-# LANGUAGE FlexibleContexts #-} {-# LANGUAGE RankNTypes #-} diff --git a/Cabal/src/Distribution/Simple/Setup.hs b/Cabal/src/Distribution/Simple/Setup.hs index 5430b5bd7ec..65978d2ce33 100644 --- a/Cabal/src/Distribution/Simple/Setup.hs +++ b/Cabal/src/Distribution/Simple/Setup.hs @@ -1,12 +1,9 @@ -{-# LANGUAGE CPP #-} {-# LANGUAGE DataKinds #-} {-# LANGUAGE DeriveGeneric #-} {-# LANGUAGE FlexibleContexts #-} {-# LANGUAGE LambdaCase #-} {-# LANGUAGE RankNTypes #-} ------------------------------------------------------------------------------ - -- | -- Module : Distribution.Simple.Setup -- Copyright : Isaac Jones 2003-2004 diff --git a/Cabal/src/Distribution/Simple/Setup/Benchmark.hs b/Cabal/src/Distribution/Simple/Setup/Benchmark.hs index a46073ba434..f33e374c15d 100644 --- a/Cabal/src/Distribution/Simple/Setup/Benchmark.hs +++ b/Cabal/src/Distribution/Simple/Setup/Benchmark.hs @@ -1,4 +1,3 @@ -{-# LANGUAGE CPP #-} {-# LANGUAGE DataKinds #-} {-# LANGUAGE DeriveGeneric #-} {-# LANGUAGE FlexibleContexts #-} @@ -6,8 +5,6 @@ {-# LANGUAGE RankNTypes #-} {-# LANGUAGE ViewPatterns #-} ------------------------------------------------------------------------------ - -- | -- Module : Distribution.Simple.Benchmark -- Copyright : Isaac Jones 2003-2004 diff --git a/Cabal/src/Distribution/Simple/Setup/Build.hs b/Cabal/src/Distribution/Simple/Setup/Build.hs index c0aedc25bd0..8c124027a1e 100644 --- a/Cabal/src/Distribution/Simple/Setup/Build.hs +++ b/Cabal/src/Distribution/Simple/Setup/Build.hs @@ -1,4 +1,3 @@ -{-# LANGUAGE CPP #-} {-# LANGUAGE DataKinds #-} {-# LANGUAGE DeriveGeneric #-} {-# LANGUAGE FlexibleContexts #-} @@ -6,8 +5,6 @@ {-# LANGUAGE RankNTypes #-} {-# LANGUAGE ViewPatterns #-} ------------------------------------------------------------------------------ - -- | -- Module : Distribution.Simple.Setup.Build -- Copyright : Isaac Jones 2003-2004 diff --git a/Cabal/src/Distribution/Simple/Setup/Clean.hs b/Cabal/src/Distribution/Simple/Setup/Clean.hs index 8700e32b4a3..1e5e8038031 100644 --- a/Cabal/src/Distribution/Simple/Setup/Clean.hs +++ b/Cabal/src/Distribution/Simple/Setup/Clean.hs @@ -1,4 +1,3 @@ -{-# LANGUAGE CPP #-} {-# LANGUAGE DataKinds #-} {-# LANGUAGE DeriveGeneric #-} {-# LANGUAGE FlexibleContexts #-} @@ -6,8 +5,6 @@ {-# LANGUAGE RankNTypes #-} {-# LANGUAGE ViewPatterns #-} ------------------------------------------------------------------------------ - -- | -- Module : Distribution.Simple.Setup.Clean -- Copyright : Isaac Jones 2003-2004 diff --git a/Cabal/src/Distribution/Simple/Setup/Common.hs b/Cabal/src/Distribution/Simple/Setup/Common.hs index f323b05aeff..8b700841ad1 100644 --- a/Cabal/src/Distribution/Simple/Setup/Common.hs +++ b/Cabal/src/Distribution/Simple/Setup/Common.hs @@ -1,11 +1,8 @@ -{-# LANGUAGE CPP #-} {-# LANGUAGE DataKinds #-} {-# LANGUAGE DeriveGeneric #-} {-# LANGUAGE FlexibleContexts #-} {-# LANGUAGE RankNTypes #-} ------------------------------------------------------------------------------ - -- | -- Module : Distribution.Simple.Setup.Common -- Copyright : Isaac Jones 2003-2004 diff --git a/Cabal/src/Distribution/Simple/Setup/Copy.hs b/Cabal/src/Distribution/Simple/Setup/Copy.hs index 65f14e20797..9d3255abf5b 100644 --- a/Cabal/src/Distribution/Simple/Setup/Copy.hs +++ b/Cabal/src/Distribution/Simple/Setup/Copy.hs @@ -1,4 +1,3 @@ -{-# LANGUAGE CPP #-} {-# LANGUAGE DataKinds #-} {-# LANGUAGE DeriveGeneric #-} {-# LANGUAGE FlexibleContexts #-} @@ -6,8 +5,6 @@ {-# LANGUAGE RankNTypes #-} {-# LANGUAGE ViewPatterns #-} ------------------------------------------------------------------------------ - -- | -- Module : Distribution.Simple.Setup.Copy -- Copyright : Isaac Jones 2003-2004 diff --git a/Cabal/src/Distribution/Simple/Setup/Global.hs b/Cabal/src/Distribution/Simple/Setup/Global.hs index 540edab9783..fa7994b39ec 100644 --- a/Cabal/src/Distribution/Simple/Setup/Global.hs +++ b/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 diff --git a/Cabal/src/Distribution/Simple/Setup/Haddock.hs b/Cabal/src/Distribution/Simple/Setup/Haddock.hs index f16faf248e9..4e0ed58e1da 100644 --- a/Cabal/src/Distribution/Simple/Setup/Haddock.hs +++ b/Cabal/src/Distribution/Simple/Setup/Haddock.hs @@ -1,4 +1,3 @@ -{-# LANGUAGE CPP #-} {-# LANGUAGE DataKinds #-} {-# LANGUAGE DeriveGeneric #-} {-# LANGUAGE FlexibleContexts #-} @@ -6,8 +5,6 @@ {-# LANGUAGE RankNTypes #-} {-# LANGUAGE ViewPatterns #-} ------------------------------------------------------------------------------ - -- | -- Module : Distribution.Simple.Setup.Haddock -- Copyright : Isaac Jones 2003-2004 diff --git a/Cabal/src/Distribution/Simple/Setup/Hscolour.hs b/Cabal/src/Distribution/Simple/Setup/Hscolour.hs index 56632d5d2f7..4ee69d99b9b 100644 --- a/Cabal/src/Distribution/Simple/Setup/Hscolour.hs +++ b/Cabal/src/Distribution/Simple/Setup/Hscolour.hs @@ -1,4 +1,3 @@ -{-# LANGUAGE CPP #-} {-# LANGUAGE DataKinds #-} {-# LANGUAGE DeriveGeneric #-} {-# LANGUAGE FlexibleContexts #-} @@ -6,8 +5,6 @@ {-# LANGUAGE RankNTypes #-} {-# LANGUAGE ViewPatterns #-} ------------------------------------------------------------------------------ - -- | -- Module : Distribution.Simple.Setup.Hscolour -- Copyright : Isaac Jones 2003-2004 diff --git a/Cabal/src/Distribution/Simple/Setup/Install.hs b/Cabal/src/Distribution/Simple/Setup/Install.hs index 627bd8b4b58..89e35f48234 100644 --- a/Cabal/src/Distribution/Simple/Setup/Install.hs +++ b/Cabal/src/Distribution/Simple/Setup/Install.hs @@ -1,4 +1,3 @@ -{-# LANGUAGE CPP #-} {-# LANGUAGE DataKinds #-} {-# LANGUAGE DeriveGeneric #-} {-# LANGUAGE FlexibleContexts #-} @@ -6,8 +5,6 @@ {-# LANGUAGE RankNTypes #-} {-# LANGUAGE ViewPatterns #-} ------------------------------------------------------------------------------ - -- | -- Module : Distribution.Simple.Setup.Install -- Copyright : Isaac Jones 2003-2004 diff --git a/Cabal/src/Distribution/Simple/Setup/Register.hs b/Cabal/src/Distribution/Simple/Setup/Register.hs index f7b9e80e007..e768ca94887 100644 --- a/Cabal/src/Distribution/Simple/Setup/Register.hs +++ b/Cabal/src/Distribution/Simple/Setup/Register.hs @@ -1,4 +1,3 @@ -{-# LANGUAGE CPP #-} {-# LANGUAGE DataKinds #-} {-# LANGUAGE DeriveGeneric #-} {-# LANGUAGE FlexibleContexts #-} @@ -6,8 +5,6 @@ {-# LANGUAGE RankNTypes #-} {-# LANGUAGE ViewPatterns #-} ------------------------------------------------------------------------------ - -- | -- Module : Distribution.Simple.Setup.Register -- Copyright : Isaac Jones 2003-2004 diff --git a/Cabal/src/Distribution/Simple/Setup/Repl.hs b/Cabal/src/Distribution/Simple/Setup/Repl.hs index fbe15df56eb..4b73cb34b99 100644 --- a/Cabal/src/Distribution/Simple/Setup/Repl.hs +++ b/Cabal/src/Distribution/Simple/Setup/Repl.hs @@ -1,4 +1,3 @@ -{-# LANGUAGE CPP #-} {-# LANGUAGE DataKinds #-} {-# LANGUAGE DeriveGeneric #-} {-# LANGUAGE FlexibleContexts #-} @@ -6,8 +5,6 @@ {-# LANGUAGE RankNTypes #-} {-# LANGUAGE ViewPatterns #-} ------------------------------------------------------------------------------ - -- | -- Module : Distribution.Simple.Setup.Repl -- Copyright : Isaac Jones 2003-2004 diff --git a/Cabal/src/Distribution/Simple/Setup/SDist.hs b/Cabal/src/Distribution/Simple/Setup/SDist.hs index 218d1e9f209..2e560dcc6b9 100644 --- a/Cabal/src/Distribution/Simple/Setup/SDist.hs +++ b/Cabal/src/Distribution/Simple/Setup/SDist.hs @@ -1,4 +1,3 @@ -{-# LANGUAGE CPP #-} {-# LANGUAGE DataKinds #-} {-# LANGUAGE DeriveGeneric #-} {-# LANGUAGE FlexibleContexts #-} @@ -6,8 +5,6 @@ {-# LANGUAGE RankNTypes #-} {-# LANGUAGE ViewPatterns #-} ------------------------------------------------------------------------------ - -- | -- Module : Distribution.Simple.Setup.SDist -- Copyright : Isaac Jones 2003-2004 diff --git a/Cabal/src/Distribution/Simple/Setup/Test.hs b/Cabal/src/Distribution/Simple/Setup/Test.hs index 45f77c938e0..6e5da7d7643 100644 --- a/Cabal/src/Distribution/Simple/Setup/Test.hs +++ b/Cabal/src/Distribution/Simple/Setup/Test.hs @@ -1,4 +1,3 @@ -{-# LANGUAGE CPP #-} {-# LANGUAGE DataKinds #-} {-# LANGUAGE DeriveGeneric #-} {-# LANGUAGE FlexibleContexts #-} @@ -6,8 +5,6 @@ {-# LANGUAGE RankNTypes #-} {-# LANGUAGE ViewPatterns #-} ------------------------------------------------------------------------------ - -- | -- Module : Distribution.Simple.Test -- Copyright : Isaac Jones 2003-2004 diff --git a/Cabal/src/Distribution/Utils/MapAccum.hs b/Cabal/src/Distribution/Utils/MapAccum.hs index 31f62d7d02f..d141649ff83 100644 --- a/Cabal/src/Distribution/Utils/MapAccum.hs +++ b/Cabal/src/Distribution/Utils/MapAccum.hs @@ -1,5 +1,3 @@ -{-# LANGUAGE CPP #-} - module Distribution.Utils.MapAccum (mapAccumM) where import Distribution.Compat.Prelude diff --git a/Cabal/src/Distribution/Utils/Progress.hs b/Cabal/src/Distribution/Utils/Progress.hs index a2c17b69113..292dfdc64cd 100644 --- a/Cabal/src/Distribution/Utils/Progress.hs +++ b/Cabal/src/Distribution/Utils/Progress.hs @@ -1,4 +1,3 @@ -{-# LANGUAGE CPP #-} {-# LANGUAGE DeriveFunctor #-} -- Note: This module was copied from cabal-install. diff --git a/cabal-install/src/Distribution/Client/Check.hs b/cabal-install/src/Distribution/Client/Check.hs index 69635ba8ed0..eb053d7e46e 100644 --- a/cabal-install/src/Distribution/Client/Check.hs +++ b/cabal-install/src/Distribution/Client/Check.hs @@ -1,9 +1,3 @@ -{-# LANGUAGE CPP #-} - ------------------------------------------------------------------------------ - ------------------------------------------------------------------------------ - -- | -- Module : Distribution.Client.Check -- Copyright : (c) Lennart Kolmodin 2008 diff --git a/cabal-install/src/Distribution/Client/CmdOutdated.hs b/cabal-install/src/Distribution/Client/CmdOutdated.hs index 7674e67286f..028b5e922e5 100644 --- a/cabal-install/src/Distribution/Client/CmdOutdated.hs +++ b/cabal-install/src/Distribution/Client/CmdOutdated.hs @@ -1,11 +1,6 @@ -{-# LANGUAGE CPP #-} {-# LANGUAGE NamedFieldPuns #-} {-# LANGUAGE RecordWildCards #-} ------------------------------------------------------------------------------ - ------------------------------------------------------------------------------ - -- | -- Module : Distribution.Client.CmdOutdated -- Maintainer : cabal-devel@haskell.org diff --git a/cabal-install/src/Distribution/Client/CmdPath.hs b/cabal-install/src/Distribution/Client/CmdPath.hs index 7c294d0b9a2..d7587219665 100644 --- a/cabal-install/src/Distribution/Client/CmdPath.hs +++ b/cabal-install/src/Distribution/Client/CmdPath.hs @@ -1,11 +1,6 @@ -{-# LANGUAGE CPP #-} {-# LANGUAGE LambdaCase #-} {-# LANGUAGE RecordWildCards #-} ------------------------------------------------------------------------------ - ------------------------------------------------------------------------------ - -- | -- Module : Distribution.Client.CmdPath -- Maintainer : cabal-devel@haskell.org diff --git a/cabal-install/src/Distribution/Client/CmdUpdate.hs b/cabal-install/src/Distribution/Client/CmdUpdate.hs index 33ae77e14e0..9dae0426281 100644 --- a/cabal-install/src/Distribution/Client/CmdUpdate.hs +++ b/cabal-install/src/Distribution/Client/CmdUpdate.hs @@ -1,4 +1,3 @@ -{-# LANGUAGE CPP #-} {-# LANGUAGE RecordWildCards #-} {-# LANGUAGE ScopedTypeVariables #-} {-# LANGUAGE TupleSections #-} diff --git a/cabal-install/src/Distribution/Client/Configure.hs b/cabal-install/src/Distribution/Client/Configure.hs index 5f82329eb52..048a7db963e 100644 --- a/cabal-install/src/Distribution/Client/Configure.hs +++ b/cabal-install/src/Distribution/Client/Configure.hs @@ -1,10 +1,5 @@ -{-# LANGUAGE CPP #-} {-# LANGUAGE DataKinds #-} ------------------------------------------------------------------------------ - ------------------------------------------------------------------------------ - -- | -- Module : Distribution.Client.Configure -- Copyright : (c) David Himmelstrup 2005, diff --git a/cabal-install/src/Distribution/Client/FileMonitor.hs b/cabal-install/src/Distribution/Client/FileMonitor.hs index 61607dd1996..6883b6b107d 100644 --- a/cabal-install/src/Distribution/Client/FileMonitor.hs +++ b/cabal-install/src/Distribution/Client/FileMonitor.hs @@ -1,5 +1,4 @@ {-# LANGUAGE BangPatterns #-} -{-# LANGUAGE CPP #-} {-# LANGUAGE DeriveFunctor #-} {-# LANGUAGE DeriveGeneric #-} {-# LANGUAGE GeneralizedNewtypeDeriving #-} diff --git a/cabal-install/src/Distribution/Client/GenBounds.hs b/cabal-install/src/Distribution/Client/GenBounds.hs index 2603a75d302..1139bf69aed 100644 --- a/cabal-install/src/Distribution/Client/GenBounds.hs +++ b/cabal-install/src/Distribution/Client/GenBounds.hs @@ -1,9 +1,3 @@ -{-# LANGUAGE CPP #-} - ------------------------------------------------------------------------------ - ------------------------------------------------------------------------------ - -- | -- Module : Distribution.Client.GenBounds -- Copyright : (c) Doug Beardsley 2015 diff --git a/cabal-install/src/Distribution/Client/IndexUtils.hs b/cabal-install/src/Distribution/Client/IndexUtils.hs index 828c6ea52c3..50beaec63f0 100644 --- a/cabal-install/src/Distribution/Client/IndexUtils.hs +++ b/cabal-install/src/Distribution/Client/IndexUtils.hs @@ -1,5 +1,4 @@ {-# LANGUAGE BangPatterns #-} -{-# LANGUAGE CPP #-} {-# LANGUAGE DataKinds #-} {-# LANGUAGE DeriveGeneric #-} {-# LANGUAGE GADTs #-} @@ -8,10 +7,6 @@ {-# LANGUAGE RecordWildCards #-} {-# LANGUAGE ScopedTypeVariables #-} ------------------------------------------------------------------------------ - ------------------------------------------------------------------------------ - -- | -- Module : Distribution.Client.IndexUtils -- Copyright : (c) Duncan Coutts 2008 diff --git a/cabal-install/src/Distribution/Client/InstallSymlink.hs b/cabal-install/src/Distribution/Client/InstallSymlink.hs index 1a2c1639bd6..506c957a4e8 100644 --- a/cabal-install/src/Distribution/Client/InstallSymlink.hs +++ b/cabal-install/src/Distribution/Client/InstallSymlink.hs @@ -1,11 +1,6 @@ -{-# LANGUAGE CPP #-} {-# LANGUAGE NamedFieldPuns #-} {-# LANGUAGE RecordWildCards #-} ------------------------------------------------------------------------------ - ------------------------------------------------------------------------------ - -- | -- Module : Distribution.Client.InstallSymlink -- Copyright : (c) Duncan Coutts 2008 diff --git a/cabal-install/src/Distribution/Client/Main.hs b/cabal-install/src/Distribution/Client/Main.hs index 2f191676c65..373662dd842 100644 --- a/cabal-install/src/Distribution/Client/Main.hs +++ b/cabal-install/src/Distribution/Client/Main.hs @@ -1,12 +1,7 @@ -{-# LANGUAGE CPP #-} {-# LANGUAGE DataKinds #-} {-# LANGUAGE LambdaCase #-} {-# LANGUAGE ScopedTypeVariables #-} ------------------------------------------------------------------------------ - ------------------------------------------------------------------------------ - -- | -- Module : Main -- Copyright : (c) David Himmelstrup 2005 diff --git a/cabal-install/src/Distribution/Client/Manpage.hs b/cabal-install/src/Distribution/Client/Manpage.hs index fa543239b79..42480f33d9e 100644 --- a/cabal-install/src/Distribution/Client/Manpage.hs +++ b/cabal-install/src/Distribution/Client/Manpage.hs @@ -1,7 +1,3 @@ -{-# LANGUAGE CPP #-} - ------------------------------------------------------------------------------ - -- | -- Module : Distribution.Client.Manpage -- Copyright : (c) Maciek Makowski 2015 diff --git a/cabal-install/src/Distribution/Client/ProjectBuilding.hs b/cabal-install/src/Distribution/Client/ProjectBuilding.hs index e70a89af8a3..7a5d1059e89 100644 --- a/cabal-install/src/Distribution/Client/ProjectBuilding.hs +++ b/cabal-install/src/Distribution/Client/ProjectBuilding.hs @@ -1,5 +1,4 @@ {-# LANGUAGE BangPatterns #-} -{-# LANGUAGE CPP #-} {-# LANGUAGE ConstraintKinds #-} {-# LANGUAGE DataKinds #-} {-# LANGUAGE NamedFieldPuns #-} diff --git a/cabal-install/src/Distribution/Client/ProjectConfig.hs b/cabal-install/src/Distribution/Client/ProjectConfig.hs index 5387f8e37db..3cde1f9af12 100644 --- a/cabal-install/src/Distribution/Client/ProjectConfig.hs +++ b/cabal-install/src/Distribution/Client/ProjectConfig.hs @@ -1,4 +1,3 @@ -{-# LANGUAGE CPP #-} {-# LANGUAGE LambdaCase #-} {-# LANGUAGE NamedFieldPuns #-} {-# LANGUAGE RecordWildCards #-} diff --git a/cabal-install/src/Distribution/Client/Sandbox.hs b/cabal-install/src/Distribution/Client/Sandbox.hs index d4523d784c5..732856a3d8f 100644 --- a/cabal-install/src/Distribution/Client/Sandbox.hs +++ b/cabal-install/src/Distribution/Client/Sandbox.hs @@ -1,12 +1,7 @@ -{-# LANGUAGE CPP #-} {-# LANGUAGE DataKinds #-} {-# LANGUAGE FlexibleContexts #-} {-# LANGUAGE RankNTypes #-} ------------------------------------------------------------------------------ - ------------------------------------------------------------------------------ - -- | -- Module : Distribution.Client.Sandbox -- Maintainer : cabal-devel@haskell.org diff --git a/cabal-install/src/Distribution/Client/Security/HTTP.hs b/cabal-install/src/Distribution/Client/Security/HTTP.hs index 9e2da46f631..814b8eb8cde 100644 --- a/cabal-install/src/Distribution/Client/Security/HTTP.hs +++ b/cabal-install/src/Distribution/Client/Security/HTTP.hs @@ -1,4 +1,3 @@ -{-# LANGUAGE CPP #-} {-# LANGUAGE FlexibleContexts #-} {-# LANGUAGE RankNTypes #-} {-# LANGUAGE ScopedTypeVariables #-} diff --git a/cabal-install/src/Distribution/Client/Targets.hs b/cabal-install/src/Distribution/Client/Targets.hs index a973433ccb8..bfa94b0da80 100644 --- a/cabal-install/src/Distribution/Client/Targets.hs +++ b/cabal-install/src/Distribution/Client/Targets.hs @@ -1,12 +1,7 @@ -{-# LANGUAGE CPP #-} {-# LANGUAGE DeriveGeneric #-} {-# LANGUAGE DeriveTraversable #-} {-# LANGUAGE ScopedTypeVariables #-} ------------------------------------------------------------------------------ - ------------------------------------------------------------------------------ - -- | -- Module : Distribution.Client.Targets -- Copyright : (c) Duncan Coutts 2011 diff --git a/cabal-install/src/Distribution/Deprecated/ParseUtils.hs b/cabal-install/src/Distribution/Deprecated/ParseUtils.hs index 4743213fde9..be99b16eea1 100644 --- a/cabal-install/src/Distribution/Deprecated/ParseUtils.hs +++ b/cabal-install/src/Distribution/Deprecated/ParseUtils.hs @@ -1,4 +1,3 @@ -{-# LANGUAGE CPP #-} {-# LANGUAGE Rank2Types #-} ----------------------------------------------------------------------------- -- This module is meant to be local-only to Distribution... diff --git a/cabal-install/src/Distribution/Deprecated/ReadP.hs b/cabal-install/src/Distribution/Deprecated/ReadP.hs index 2e6f9c189b8..69e1c38006e 100644 --- a/cabal-install/src/Distribution/Deprecated/ReadP.hs +++ b/cabal-install/src/Distribution/Deprecated/ReadP.hs @@ -1,10 +1,5 @@ -{-# LANGUAGE CPP #-} {-# LANGUAGE GADTs #-} ------------------------------------------------------------------------------ - ------------------------------------------------------------------------------ - -- | -- -- Module : Distribution.Deprecated.ReadP diff --git a/cabal-install/tests/UnitTests/Distribution/Client/FileMonitor.hs b/cabal-install/tests/UnitTests/Distribution/Client/FileMonitor.hs index 77f84108563..d14f87d06da 100644 --- a/cabal-install/tests/UnitTests/Distribution/Client/FileMonitor.hs +++ b/cabal-install/tests/UnitTests/Distribution/Client/FileMonitor.hs @@ -1,5 +1,3 @@ -{-# LANGUAGE CPP #-} - module UnitTests.Distribution.Client.FileMonitor (tests) where import Distribution.Parsec (simpleParsec) diff --git a/cabal-install/tests/UnitTests/Distribution/Client/Glob.hs b/cabal-install/tests/UnitTests/Distribution/Client/Glob.hs index c51ce7e2448..38d245a045c 100644 --- a/cabal-install/tests/UnitTests/Distribution/Client/Glob.hs +++ b/cabal-install/tests/UnitTests/Distribution/Client/Glob.hs @@ -1,4 +1,3 @@ -{-# LANGUAGE CPP #-} {-# OPTIONS_GHC -fno-warn-orphans #-} module UnitTests.Distribution.Client.Glob (tests) where diff --git a/cabal-install/tests/UnitTests/Distribution/Client/UserConfig.hs b/cabal-install/tests/UnitTests/Distribution/Client/UserConfig.hs index 91ed61c86cd..a9cb90c64f1 100644 --- a/cabal-install/tests/UnitTests/Distribution/Client/UserConfig.hs +++ b/cabal-install/tests/UnitTests/Distribution/Client/UserConfig.hs @@ -1,5 +1,3 @@ -{-# LANGUAGE CPP #-} - module UnitTests.Distribution.Client.UserConfig ( tests ) where diff --git a/cabal-install/tests/UnitTests/Distribution/Solver/Modular/QuickCheck.hs b/cabal-install/tests/UnitTests/Distribution/Solver/Modular/QuickCheck.hs index 2b308d770ae..d53729e1a21 100644 --- a/cabal-install/tests/UnitTests/Distribution/Solver/Modular/QuickCheck.hs +++ b/cabal-install/tests/UnitTests/Distribution/Solver/Modular/QuickCheck.hs @@ -1,4 +1,3 @@ -{-# LANGUAGE CPP #-} {-# LANGUAGE DeriveGeneric #-} {-# LANGUAGE StandaloneDeriving #-} {-# OPTIONS_GHC -fno-warn-orphans #-} diff --git a/cabal-install/tests/UnitTests/Distribution/Solver/Types/OptionalStanza.hs b/cabal-install/tests/UnitTests/Distribution/Solver/Types/OptionalStanza.hs index 3e2959b01f2..61f94ea28b4 100644 --- a/cabal-install/tests/UnitTests/Distribution/Solver/Types/OptionalStanza.hs +++ b/cabal-install/tests/UnitTests/Distribution/Solver/Types/OptionalStanza.hs @@ -1,5 +1,3 @@ -{-# LANGUAGE CPP #-} - module UnitTests.Distribution.Solver.Types.OptionalStanza ( tests ) where diff --git a/cabal-testsuite/main/cabal-tests.hs b/cabal-testsuite/main/cabal-tests.hs index a732fda6d48..05871ab7190 100644 --- a/cabal-testsuite/main/cabal-tests.hs +++ b/cabal-testsuite/main/cabal-tests.hs @@ -1,4 +1,3 @@ -{-# LANGUAGE CPP #-} {-# LANGUAGE NondecreasingIndentation #-} {-# LANGUAGE ScopedTypeVariables #-} {-# LANGUAGE TypeApplications #-} diff --git a/cabal-testsuite/src/Test/Cabal/TestCode.hs b/cabal-testsuite/src/Test/Cabal/TestCode.hs index ddaa0239465..1809f5e1239 100644 --- a/cabal-testsuite/src/Test/Cabal/TestCode.hs +++ b/cabal-testsuite/src/Test/Cabal/TestCode.hs @@ -1,4 +1,3 @@ -{-# LANGUAGE CPP #-} {-# LANGUAGE DerivingStrategies #-} {-# LANGUAGE GeneralizedNewtypeDeriving #-}