Remove old warnings section in generated cabal files

This is a follow-up to haskell#11261

Author: Kleidukos

cabal-install/src/Distribution/Client/Init/Format.hs

@@ -314,80 +314,75 @@ mkExeStanza opts (ExeTarget exeMain appDirs lang otherMods exts deps tools) =
 
 mkTestStanza :: WriteOpts -> TestTarget -> PrettyField FieldAnnotation
 mkTestStanza opts (TestTarget testMain dirs lang otherMods exts deps tools) =
-  PrettySection
-    annNoComments
-    (toUTF8BS "test-suite")
-    [suiteName]
-    ( insertCommonStanzas opts
-        ++ insertRtsOptionsStanza opts
-        ++ [ case specHasCommonStanzas $ _optCabalSpec opts of
-              NoCommonStanzas -> PrettyEmpty
-              _ ->
-                field
-                  "import"
-                  (hsep . map text)
-                  ["warnings"]
-                  ["Import common warning flags."]
+  let commonSections =
+        case specHasCommonStanzas $ _optCabalSpec opts of
+          NoCommonStanzas -> [PrettyEmpty]
+          _ ->
+            insertCommonStanzas opts
+              ++ insertRtsOptionsStanza opts
+   in PrettySection
+        annNoComments
+        (toUTF8BS "test-suite")
+        [suiteName]
+        ( commonSections
+            ++ [ field
+                  "default-language"
+                  id
+                  lang
+                  ["Base language which the package is written in."]
+                  True
+                  opts
+               , field
+                  "other-modules"
+                  formatOtherModules
+                  otherMods
+                  ["Modules included in this executable, other than Main."]
+                  True
+                  opts
+               , field
+                  "other-extensions"
+                  formatOtherExtensions
+                  exts
+                  ["LANGUAGE extensions used by modules in this package."]
+                  True
+                  opts
+               , field
+                  "type"
+                  text
+                  "exitcode-stdio-1.0"
+                  ["The interface type and version of the test suite."]
+                  True
+                  opts
+               , field
+                  "hs-source-dirs"
+                  formatHsSourceDirs
+                  (makeSymbolicPath <$> dirs)
+                  ["Directories containing source files."]
+                  True
+                  opts
+               , field
+                  "main-is"
+                  unsafeFromHs
+                  testMain
+                  ["The entrypoint to the test suite."]
+                  True
+                  opts
+               , field
+                  "build-depends"
+                  formatDependencyList
+                  deps
+                  ["Test dependencies."]
+                  True
+                  opts
+               , field
+                  (buildToolTag opts)
+                  formatDependencyList
+                  tools
+                  ["Extra tools (e.g. alex, hsc2hs, ...) needed to build the source."]
                   False
                   opts
-           , field
-              "default-language"
-              id
-              lang
-              ["Base language which the package is written in."]
-              True
-              opts
-           , field
-              "other-modules"
-              formatOtherModules
-              otherMods
-              ["Modules included in this executable, other than Main."]
-              True
-              opts
-           , field
-              "other-extensions"
-              formatOtherExtensions
-              exts
-              ["LANGUAGE extensions used by modules in this package."]
-              True
-              opts
-           , field
-              "type"
-              text
-              "exitcode-stdio-1.0"
-              ["The interface type and version of the test suite."]
-              True
-              opts
-           , field
-              "hs-source-dirs"
-              formatHsSourceDirs
-              (makeSymbolicPath <$> dirs)
-              ["Directories containing source files."]
-              True
-              opts
-           , field
-              "main-is"
-              unsafeFromHs
-              testMain
-              ["The entrypoint to the test suite."]
-              True
-              opts
-           , field
-              "build-depends"
-              formatDependencyList
-              deps
-              ["Test dependencies."]
-              True
-              opts
-           , field
-              (buildToolTag opts)
-              formatDependencyList
-              tools
-              ["Extra tools (e.g. alex, hsc2hs, ...) needed to build the source."]
-              False
-              opts
-           ]
-    )
+               ]
+        )
   where
     suiteName = text $ unPackageName (_optPkgName opts) ++ "-test"
 

cabal-install/tests/fixtures/init/golden/cabal/cabal-lib-and-exe-no-comments.golden

@@ -54,7 +54,6 @@ test-suite y-test
     import:           extensions
     import:           ghc-options
     import:           rts-options
-    import:           warnings
     default-language: Haskell2010
     -- other-modules:
     -- other-extensions:

cabal-install/tests/fixtures/init/golden/cabal/cabal-lib-and-exe-with-comments.golden

@@ -130,9 +130,6 @@ test-suite y-test
     -- Common RTS options
     import:           rts-options
 
-    -- Import common warning flags.
-    import:           warnings
-
     -- Base language which the package is written in.
     default-language: Haskell2010
 

cabal-install/tests/fixtures/init/golden/cabal/cabal-lib-no-comments.golden

@@ -40,7 +40,6 @@ test-suite y-test
     import:           extensions
     import:           ghc-options
     import:           rts-options
-    import:           warnings
     default-language: Haskell2010
     -- other-modules:
     -- other-extensions:

cabal-install/tests/fixtures/init/golden/cabal/cabal-lib-with-comments.golden

@@ -100,9 +100,6 @@ test-suite y-test
     -- Common RTS options
     import:           rts-options
 
-    -- Import common warning flags.
-    import:           warnings
-
     -- Base language which the package is written in.
     default-language: Haskell2010
 

cabal-install/tests/fixtures/init/golden/cabal/cabal-test-suite-no-comments.golden

@@ -30,7 +30,6 @@ test-suite y-test
     import:           extensions
     import:           ghc-options
     import:           rts-options
-    import:           warnings
     default-language: Haskell2010
     -- other-modules:
     -- other-extensions:

cabal-install/tests/fixtures/init/golden/cabal/cabal-test-suite-with-comments.golden

@@ -75,9 +75,6 @@ test-suite y-test
     -- Common RTS options
     import:           rts-options
 
-    -- Import common warning flags.
-    import:           warnings
-
     -- Base language which the package is written in.
     default-language: Haskell2010
 

cabal-install/tests/fixtures/init/golden/test/standalone-test-no-comments.golden

@@ -2,7 +2,6 @@ test-suite y-test
     import:           extensions
     import:           ghc-options
     import:           rts-options
-    import:           warnings
     default-language: Haskell2010
     -- other-modules:
     -- other-extensions:

cabal-install/tests/fixtures/init/golden/test/standalone-test-with-comments.golden

@@ -8,9 +8,6 @@ test-suite y-test
     -- Common RTS options
     import:           rts-options
 
-    -- Import common warning flags.
-    import:           warnings
-
     -- Base language which the package is written in.
     default-language: Haskell2010
 

cabal-install/tests/fixtures/init/golden/test/test-build-tools-with-comments.golden

@@ -8,9 +8,6 @@ test-suite y-test
     -- Common RTS options
     import:             rts-options
 
-    -- Import common warning flags.
-    import:             warnings
-
     -- Base language which the package is written in.
     default-language:   Haskell2010