remove early experiment "import" fields in TestSuite and Benchmark

Author: leana8959

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

@@ -283,7 +283,7 @@ executableFieldGrammar
   => UnqualComponentName
   -> g Executable Executable
 executableFieldGrammar n =
-  Executable n []
+  Executable n
     -- main-is is optional as conditional blocks don't have it
     <$> optionalFieldDefAla "main-is" RelativePathNT L.modulePath (modulePath mempty)
     <*> optionalFieldDef "scope" L.exeScope ExecutablePublic

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

@@ -15,16 +15,13 @@ import Prelude ()
 import Distribution.ModuleName
 import Distribution.Types.BuildInfo
 import Distribution.Types.ExecutableScope
-import Distribution.Types.Imports
 import Distribution.Types.UnqualComponentName
 import Distribution.Utils.Path
 
 import qualified Distribution.Types.BuildInfo.Lens as L
 
 data Executable = Executable
   { exeName :: UnqualComponentName
-  , exeImports :: [ImportName]
-  -- ^ Retained for exact print
   , modulePath :: RelativePath Source File
   , exeScope :: ExecutableScope
   , buildInfo :: BuildInfo
@@ -42,7 +39,6 @@ instance Monoid Executable where
   mempty =
     Executable
       { exeName = mempty
-      , exeImports = mempty
       , modulePath = unsafeMakeSymbolicPath ""
       , exeScope = mempty
       , buildInfo = mempty
@@ -53,7 +49,6 @@ instance Semigroup Executable where
   a <> b =
     Executable
       { exeName = combineNames a b exeName "executable"
-      , exeImports = combine exeImports
       , modulePath = unsafeMakeSymbolicPath $ combineNames a b (getSymbolicPath . modulePath) "modulePath"
       , exeScope = combine exeScope
       , buildInfo = combine buildInfo

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

@@ -13,7 +13,6 @@ import Distribution.Compat.Prelude
 import Prelude ()
 
 import Distribution.Types.BuildInfo
-import Distribution.Types.Imports
 import Distribution.Types.TestSuiteInterface
 import Distribution.Types.TestType
 import Distribution.Types.UnqualComponentName
@@ -25,7 +24,6 @@ import qualified Distribution.Types.BuildInfo.Lens as L
 -- | A \"test-suite\" stanza in a cabal file.
 data TestSuite = TestSuite
   { testName :: UnqualComponentName
-  , testSuiteImports :: [ImportName]
   , testInterface :: TestSuiteInterface
   , testBuildInfo :: BuildInfo
   , testCodeGenerators :: [String]
@@ -44,7 +42,6 @@ instance Monoid TestSuite where
   mempty =
     TestSuite
       { testName = mempty
-      , testSuiteImports = mempty
       , testInterface = mempty
       , testBuildInfo = mempty
       , testCodeGenerators = mempty
@@ -55,7 +52,6 @@ instance Semigroup TestSuite where
   a <> b =
     TestSuite
       { testName = combineNames a b testName "test"
-      , testSuiteImports = combine testSuiteImports
       , testInterface = combine testInterface
       , testBuildInfo = combine testBuildInfo
       , testCodeGenerators = combine testCodeGenerators

Cabal-syntax/src/Distribution/Types/TestSuite/Lens.hs

@@ -8,17 +8,12 @@ import Distribution.Compat.Prelude
 import Prelude ()
 
 import Distribution.Types.BuildInfo (BuildInfo)
-import Distribution.Types.Imports (ImportName)
 import Distribution.Types.TestSuite (TestSuite)
 import Distribution.Types.TestSuiteInterface (TestSuiteInterface)
 import Distribution.Types.UnqualComponentName (UnqualComponentName)
 
 import qualified Distribution.Types.TestSuite as T
 
-testSuiteImports :: Lens' TestSuite [ImportName]
-testSuiteImports f s = fmap (\x -> s{T.testSuiteImports = x}) (f (T.testSuiteImports s))
-{-# INLINE testSuiteImports #-}
-
 testName :: Lens' TestSuite UnqualComponentName
 testName f s = fmap (\x -> s{T.testName = x}) (f (T.testName s))
 {-# INLINE testName #-}

Cabal/src/Distribution/PackageDescription/Check/Target.hs

@@ -138,7 +138,6 @@ checkExecutable
   ads
   exe@( Executable
           exeName_
-          _exeImports_
           symbolicModulePath_
           _exeScope_
           buildInfo_
@@ -195,7 +194,6 @@ checkTestSuite
   ads
   ts@( TestSuite
         testName_
-        _testImports_
         testInterface_
         testBuildInfo_
         _testCodeGenerators_

Cabal/src/Distribution/Simple/Build.hs

@@ -767,7 +767,6 @@ testSuiteExeV10AsExe :: TestSuite -> Executable
 testSuiteExeV10AsExe test@TestSuite{testInterface = TestSuiteExeV10 _ mainFile} =
   Executable
     { exeName = testName test
-    , exeImports = mempty
     , modulePath = mainFile
     , exeScope = ExecutablePublic
     , buildInfo = testBuildInfo test
@@ -779,7 +778,6 @@ benchmarkExeV10asExe :: Benchmark -> Executable
 benchmarkExeV10asExe bm@Benchmark{benchmarkInterface = BenchmarkExeV10 _ mainFile} =
   Executable
     { exeName = benchmarkName bm
-    , exeImports = mempty
     , modulePath = mainFile
     , exeScope = ExecutablePublic
     , buildInfo = benchmarkBuildInfo bm
@@ -862,7 +860,6 @@ testSuiteLibV09AsLibAndExe
       exe =
         Executable
           { exeName = mkUnqualComponentName $ stubName test
-          , exeImports = mempty
           , modulePath = makeRelativePathEx $ stubFilePath test
           , exeScope = ExecutablePublic
           , buildInfo =

Cabal/src/Distribution/Simple/Haddock.hs

@@ -994,7 +994,6 @@ compToExe comp =
       Just
         Executable
           { exeName = testName test
-          , exeImports = mempty
           , modulePath = f
           , exeScope = ExecutablePublic
           , buildInfo = testBuildInfo test
@@ -1003,7 +1002,6 @@ compToExe comp =
       Just
         Executable
           { exeName = benchmarkName bench
-          , exeImports = mempty
           , modulePath = f
           , exeScope = ExecutablePublic
           , buildInfo = benchmarkBuildInfo bench