Export Proxy, Set and Identity from D.C.Prelude

Cabal/Distribution/Backpack.hs

@@ -54,7 +54,6 @@ import Distribution.Types.UnitId
 import Distribution.Utils.Base62
 
 import qualified Data.Map as Map
-import           Data.Set (Set)
 import qualified Data.Set as Set
 
 -----------------------------------------------------------------------

Cabal/Distribution/Backpack/ModSubst.hs

@@ -13,12 +13,10 @@ module Distribution.Backpack.ModSubst (
 import Prelude ()
 import Distribution.Compat.Prelude hiding (mod)
 
-import Distribution.ModuleName
-
 import Distribution.Backpack
+import Distribution.ModuleName
 
 import qualified Data.Map as Map
-import Data.Set (Set)
 import qualified Data.Set as Set
 
 -- | Applying module substitutions to semantic objects.

Cabal/Distribution/Backpack/ModuleShape.hs

@@ -17,7 +17,6 @@ import Distribution.Backpack.ModSubst
 import Distribution.Backpack
 
 import qualified Data.Map as Map
-import Data.Set (Set)
 import qualified Data.Set as Set
 
 -----------------------------------------------------------------------

Cabal/Distribution/Backpack/PreModuleShape.hs

@@ -11,7 +11,6 @@ module Distribution.Backpack.PreModuleShape (
 import Prelude ()
 import Distribution.Compat.Prelude
 
-import Data.Set (Set)
 import qualified Data.Set as Set
 import qualified Data.Map as Map
 

Cabal/Distribution/Compat/Lens.hs

@@ -51,7 +51,6 @@ import Prelude()
 import Distribution.Compat.Prelude
 
 import Control.Applicative (Const (..))
-import Data.Functor.Identity (Identity (..))
 import Control.Monad.State.Class (MonadState (..), gets, modify)
 
 import qualified Distribution.Compat.DList as DList

Cabal/Distribution/Compat/Prelude.hs

@@ -45,6 +45,9 @@ module Distribution.Compat.Prelude (
     -- * Some types
     IO, NoCallStackIO,
     Map,
+    Set,
+    Identity (..),
+    Proxy (..),
 
     -- * Data.Maybe
     catMaybes, mapMaybe,
@@ -138,7 +141,10 @@ import GHC.Generics                  (Generic, Rep(..),
                                       V1, U1(U1), K1(unK1), M1(unM1),
                                       (:*:)((:*:)), (:+:)(L1,R1))
 
+import Data.Functor.Identity         (Identity (..))
 import Data.Map                      (Map)
+import Data.Proxy                    (Proxy (..))
+import Data.Set                      (Set)
 
 import Control.Arrow                 (first)
 import Control.Monad                 hiding (mapM)

Cabal/Distribution/FieldGrammar/Class.hs

@@ -10,8 +10,6 @@ import Distribution.Compat.Lens
 import Distribution.Compat.Prelude
 import Prelude ()
 
-import Data.Functor.Identity (Identity (..))
-
 import Distribution.CabalSpecVersion (CabalSpecVersion)
 import Distribution.Compat.Newtype   (Newtype)
 import Distribution.Fields.Field

Cabal/Distribution/FieldGrammar/Parsec.hs

@@ -66,7 +66,6 @@ module Distribution.FieldGrammar.Parsec (
 
 import Data.List                   (dropWhileEnd)
 import Data.Ord                    (comparing)
-import Data.Set                    (Set)
 import Distribution.Compat.Newtype
 import Distribution.Compat.Prelude
 import Distribution.Simple.Utils   (fromUTF8BS)

Cabal/Distribution/Fields/Pretty.hs

@@ -20,7 +20,6 @@ module Distribution.Fields.Pretty (
     prettySectionArgs,
     ) where
 
-import Data.Functor.Identity       (Identity (..))
 import Distribution.Compat.Prelude
 import Distribution.Pretty         (showToken)
 import Prelude ()

Cabal/Distribution/InstalledPackageInfo.hs

@@ -43,7 +43,6 @@ module Distribution.InstalledPackageInfo (
 import Distribution.Compat.Prelude
 import Prelude ()
 
-import Data.Set                              (Set)
 import Distribution.Backpack
 import Distribution.CabalSpecVersion         (cabalSpecLatest)
 import Distribution.FieldGrammar

Cabal/Distribution/PackageDescription/Configuration.hs

@@ -65,7 +65,6 @@ import Distribution.Types.DependencyMap
 
 import qualified Data.Map.Strict as Map.Strict
 import qualified Data.Map.Lazy   as Map
-import Data.Set ( Set )
 import qualified Data.Set as Set
 import Data.Tree ( Tree(Node) )
 

Cabal/Distribution/Parsec.hs

@@ -42,7 +42,6 @@ module Distribution.Parsec (
     ) where
 
 import Data.Char                           (digitToInt, intToDigit)
-import Data.Functor.Identity               (Identity (..))
 import Data.List                           (transpose)
 import Distribution.CabalSpecVersion
 import Distribution.Compat.Prelude

Cabal/Distribution/Parsec/Newtypes.hs

@@ -33,8 +33,6 @@ import Distribution.Compat.Newtype
 import Distribution.Compat.Prelude
 import Prelude ()
 
-import Data.Functor.Identity         (Identity (..))
-import Data.Proxy                    (Proxy (..))
 import Distribution.CabalSpecVersion
 import Distribution.Compiler         (CompilerFlavor)
 import Distribution.License          (License)

Cabal/Distribution/Pretty.hs

@@ -12,7 +12,6 @@ module Distribution.Pretty (
     Separator,
     ) where
 
-import Data.Functor.Identity         (Identity (..))
 import Distribution.CabalSpecVersion
 import Distribution.Compat.Prelude
 import Prelude ()

Cabal/Distribution/Simple/Program/GHC.hs

@@ -45,7 +45,6 @@ import Language.Haskell.Extension
 import Data.List (stripPrefix)
 import qualified Data.Map as Map
 import Data.Monoid (All(..), Any(..), Endo(..))
-import Data.Set (Set)
 import qualified Data.Set as Set
 
 normaliseGhcArgs :: Maybe Version -> PackageDescription -> [String] -> [String]

Cabal/Distribution/Types/Dependency.hs

@@ -29,7 +29,6 @@ import Distribution.Types.LibraryName
 import Distribution.Types.UnqualComponentName
 
 import Text.PrettyPrint ((<+>))
-import Data.Set (Set)
 import qualified Data.Set as Set
 
 -- | Describes a dependency on a source package (API)

Cabal/Distribution/Types/DependencyMap.hs

@@ -13,7 +13,6 @@ import Distribution.Types.PackageName
 import Distribution.Types.LibraryName
 import Distribution.Version
 
-import Data.Set (Set)
 import qualified Data.Map.Lazy as Map
 
 -- | A map of dependencies.  Newtyped since the default monoid instance is not

Cabal/Distribution/Verbosity.hs

@@ -55,7 +55,6 @@ import Distribution.Compat.Prelude
 import Distribution.ReadE
 
 import Data.List (elemIndex)
-import Data.Set (Set)
 import Distribution.Parsec
 import Distribution.Verbosity.Internal
 

cabal-install/Distribution/Client/CmdExec.hs

@@ -92,7 +92,6 @@ import Distribution.Verbosity
 import Prelude ()
 import Distribution.Client.Compat.Prelude
 
-import Data.Set (Set)
 import qualified Data.Set as S
 import qualified Data.Map as M
 

cabal-install/Distribution/Client/Compat/Prelude.hs

@@ -13,9 +13,7 @@
 module Distribution.Client.Compat.Prelude
   ( module Distribution.Compat.Prelude.Internal
   , Prelude.IO
-  , Proxy (..)
   ) where
 
 import Prelude (IO)
 import Distribution.Compat.Prelude.Internal hiding (IO)
-import Data.Proxy (Proxy (..))