fixup! Add PackageInfos_ (haskell#3909)

Author: blackheaven

Cabal/src/Distribution/PackageDescription/Check.hs

@@ -231,7 +231,8 @@ data CheckExplanation =
         | SuspiciousFlagName [String]
         | DeclaredUsedFlags (Set FlagName) (Set FlagName)
         | NonASCIICustomField [String]
-        | RebindableClash
+        | RebindableClashPaths
+        | RebindableClashPackageInfos
         | WErrorUnneeded String
         | JUnneeded String
         | FDeferTypeErrorsUnneeded String
@@ -699,12 +700,18 @@ ppExplanation (NonASCIICustomField nonAsciiXFields) =
     "Non ascii custom fields: " ++ unwords nonAsciiXFields ++ ". "
       ++ "For better compatibility, custom field names "
       ++ "shouldn't contain non-ascii characters."
-ppExplanation RebindableClash =
+ppExplanation RebindableClashPaths =
     "Packages using RebindableSyntax with OverloadedStrings or"
       ++ " OverloadedLists in default-extensions, in conjunction with the"
       ++ " autogenerated module Paths_*, are known to cause compile failures"
       ++ " with Cabal < 2.2. To use these default-extensions with a Paths_*"
       ++ " autogen module, specify at least 'cabal-version: 2.2'."
+ppExplanation RebindableClashPackageInfos =
+    "Packages using RebindableSyntax with OverloadedStrings or"
+      ++ " OverloadedLists in default-extensions, in conjunction with the"
+      ++ " autogenerated module PackageInfos_*, are known to cause compile failures"
+      ++ " with Cabal < 2.2. To use these default-extensions with a Paths_*"
+      ++ " autogen module, specify at least 'cabal-version: 2.2'."
 ppExplanation (WErrorUnneeded fieldName) = addConditionalExp $
     "'" ++ fieldName ++ ": -Werror' makes the package easy to "
       ++ "break with future GHC versions because new GHC versions often "
@@ -1936,18 +1943,22 @@ checkUnicodeXFields gpd
 
 -- | cabal-version <2.2 + Paths_module + default-extensions: doesn't build.
 checkPathsModuleExtensions :: PackageDescription -> [PackageCheck]
-checkPathsModuleExtensions = checkAutogenModuleExtensions autogenPathsModuleName
+checkPathsModuleExtensions = checkAutogenModuleExtensions autogenPathsModuleName RebindableClashPaths
 
 -- | cabal-version <2.2 + PackageInfos_module + default-extensions: doesn't build.
 checkPackageInfosModuleExtensions :: PackageDescription -> [PackageCheck]
-checkPackageInfosModuleExtensions = checkAutogenModuleExtensions autogenPackageInfosModuleName
+checkPackageInfosModuleExtensions = checkAutogenModuleExtensions autogenPackageInfosModuleName RebindableClashPackageInfos
 
 -- | cabal-version <2.2 + *_module + default-extensions: doesn't build.
-checkAutogenModuleExtensions :: (PackageDescription -> ModuleName) -> PackageDescription -> [PackageCheck]
-checkAutogenModuleExtensions autogenModuleName pd
+checkAutogenModuleExtensions ::
+  (PackageDescription -> ModuleName) ->
+  CheckExplanation ->
+  PackageDescription ->
+  [PackageCheck]
+checkAutogenModuleExtensions autogenModuleName explanation pd
     | specVersion pd >= CabalSpecV2_2 = []
     | any checkBI (allBuildInfo pd) || any checkLib (allLibraries pd)
-        = return (PackageBuildImpossible RebindableClash)
+        = return (PackageBuildImpossible explanation)
     | otherwise = []
   where
     mn = autogenModuleName pd

cabal-testsuite/PackageTests/Check/NonConfCheck/PathsExtensions/cabal.out

@@ -1,4 +1,5 @@
 # cabal check
 Warning: The package will not build sanely due to these errors:
 Warning: Packages using RebindableSyntax with OverloadedStrings or OverloadedLists in default-extensions, in conjunction with the autogenerated module Paths_*, are known to cause compile failures with Cabal < 2.2. To use these default-extensions with a Paths_* autogen module, specify at least 'cabal-version: 2.2'.
+Warning: Packages using RebindableSyntax with OverloadedStrings or OverloadedLists in default-extensions, in conjunction with the autogenerated module Paths_*, are known to cause compile failures with Cabal < 2.2. To use these default-extensions with a PackageInfos_* autogen module, specify at least 'cabal-version: 2.2'.
 Warning: Hackage would reject this package.