Remove old common stanza

Author: Kleidukos

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

@@ -72,7 +72,6 @@ writeProject (ProjectSettings opts pkgDesc libTarget exeTarget testTarget)
       writeChangeLog opts pkgDesc
 
       let pkgFields = mkPkgDescription opts pkgDesc
-          commonStanza = mkCommonStanza opts
           extensionsStanza = mkExtensionsStanza opts
           ghcOptionsStanza = mkGhcOptionsStanza opts
           rtsOptionsStanza = mkRtsOptionsStanza opts
@@ -83,7 +82,7 @@ writeProject (ProjectSettings opts pkgDesc libTarget exeTarget testTarget)
 
       (reusedCabal, cabalContents) <-
         writeCabalFile opts $
-          pkgFields ++ [extensionsStanza, ghcOptionsStanza, rtsOptionsStanza, commonStanza, libStanza, exeStanza, testStanza]
+          pkgFields ++ [extensionsStanza, ghcOptionsStanza, rtsOptionsStanza, libStanza, exeStanza, testStanza]
 
       when (null $ _pkgSynopsis pkgDesc) $
         message opts T.Warning "No synopsis given. You should edit the .cabal file and add one."

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

@@ -21,7 +21,6 @@ module Distribution.Client.Init.Format
   , postProcessFieldLines
 
     -- * stanza generation
-  , mkCommonStanza
   , mkLibStanza
   , mkExeStanza
   , mkTestStanza
@@ -124,18 +123,6 @@ postProcessFieldLines ann
 -- -------------------------------------------------------------------- --
 -- Stanzas
 
--- The common stanzas are hardcoded for simplicity purposes,
--- see https://github.com/haskell/cabal/pull/7558#discussion_r693173846
-mkCommonStanza :: WriteOpts -> PrettyField FieldAnnotation
-mkCommonStanza opts = case specHasCommonStanzas $ _optCabalSpec opts of
-  NoCommonStanzas -> PrettyEmpty
-  _ ->
-    PrettySection
-      annNoComments
-      "common"
-      [text "warnings"]
-      [field "ghc-options" text "-Wall" [] False opts]
-
 mkGhcOptionsStanza :: WriteOpts -> PrettyField FieldAnnotation
 mkGhcOptionsStanza opts = case specHasCommonStanzas $ _optCabalSpec opts of
   NoCommonStanzas -> PrettyEmpty

cabal-install/tests/UnitTests/Distribution/Client/Init/Golden.hs

@@ -289,25 +289,31 @@ goldenCabalTests v pkgIx srcDb =
         Left e -> assertFailure $ show e
         (Right (ProjectSettings opts pkgDesc (Just libTarget) (Just exeTarget) (Just testTarget), _)) -> do
           let pkgFields = mkPkgDescription opts pkgDesc
-              commonStanza = mkCommonStanza opts
+              rtsOptionsStanza = mkRtsOptionsStanza opts
+              ghcOptionsStanza = mkGhcOptionsStanza opts
+              extensionsStanza = mkExtensionsStanza opts
               libStanza = mkLibStanza opts $ libTarget{_libDependencies = mangleBaseDep libTarget _libDependencies}
               exeStanza = mkExeStanza opts $ exeTarget{_exeDependencies = mangleBaseDep exeTarget _exeDependencies}
               testStanza = mkTestStanza opts $ testTarget{_testDependencies = mangleBaseDep testTarget _testDependencies}
 
-          mkStanza $ pkgFields ++ [commonStanza, libStanza, exeStanza, testStanza]
+          mkStanza $ pkgFields ++ [extensionsStanza, ghcOptionsStanza, rtsOptionsStanza, libStanza, exeStanza, testStanza]
         (Right (ProjectSettings opts pkgDesc (Just libTarget) Nothing (Just testTarget), _)) -> do
           let pkgFields = mkPkgDescription opts pkgDesc
-              commonStanza = mkCommonStanza opts
+              rtsOptionsStanza = mkRtsOptionsStanza opts
+              ghcOptionsStanza = mkGhcOptionsStanza opts
+              extensionsStanza = mkExtensionsStanza opts
               libStanza = mkLibStanza opts $ libTarget{_libDependencies = mangleBaseDep libTarget _libDependencies}
               testStanza = mkTestStanza opts $ testTarget{_testDependencies = mangleBaseDep testTarget _testDependencies}
 
-          mkStanza $ pkgFields ++ [commonStanza, libStanza, testStanza]
+          mkStanza $ pkgFields ++ [extensionsStanza, ghcOptionsStanza, rtsOptionsStanza, libStanza, testStanza]
         (Right (ProjectSettings opts pkgDesc Nothing Nothing (Just testTarget), _)) -> do
           let pkgFields = mkPkgDescription opts pkgDesc
-              commonStanza = mkCommonStanza opts
+              rtsOptionsStanza = mkRtsOptionsStanza opts
+              ghcOptionsStanza = mkGhcOptionsStanza opts
+              extensionsStanza = mkExtensionsStanza opts
               testStanza = mkTestStanza opts $ testTarget{_testDependencies = mangleBaseDep testTarget _testDependencies}
 
-          mkStanza $ pkgFields ++ [commonStanza, testStanza]
+          mkStanza $ pkgFields ++ [extensionsStanza, ghcOptionsStanza, rtsOptionsStanza, testStanza]
         (Right (ProjectSettings _ _ l e t, _)) ->
           assertFailure $
             show l ++ "\n" ++ show e ++ "\n" ++ show t