Remove module 'PrettyPrintIndent' and move function 'indentWith' into module 'ParseUtils'

Cabal/Cabal.cabal

@@ -151,7 +151,6 @@ library
     Distribution.PackageDescription.Configuration
     Distribution.PackageDescription.Parse
     Distribution.PackageDescription.PrettyPrint
-    Distribution.PackageDescription.PrettyPrintIndent
     Distribution.PackageDescription.Utils
     Distribution.ParseUtils
     Distribution.ReadE

Cabal/Distribution/PackageDescription/PrettyPrint.hs

@@ -59,12 +59,11 @@ import Text.PrettyPrint
        (hsep, comma, punctuate, parens, char, nest, empty,
         isEmpty, ($$), (<+>), colon, (<>), text, vcat, ($+$), Doc, render)
 import Distribution.Simple.Utils (writeUTF8File)
-import Distribution.ParseUtils (showFreeText, FieldDescr(..))
+import Distribution.ParseUtils (showFreeText, FieldDescr(..), indentWith)
 import Distribution.PackageDescription.Parse (pkgDescrFieldDescrs,binfoFieldDescrs,libFieldDescrs,
        sourceRepoFieldDescrs)
 import Distribution.Package (Dependency(..))
 import Distribution.Text (Text(..))
-import Distribution.PackageDescription.PrettyPrintIndent (indentWith)
 import Data.Maybe (isJust, fromJust, isNothing)
 
 -- | Recompile with false for regression testing

Cabal/Distribution/PackageDescription/PrettyPrintIndent.hs

-
-module Distribution.PackageDescription.PrettyPrintIndent
-   ( indentWith
-   ) where
-
--- | the indentation used for pretty printing
-indentWith :: Int
-indentWith = 4

Cabal/Distribution/ParseUtils.hs

@@ -62,7 +62,7 @@ module Distribution.ParseUtils (
         parseSepList, parseCommaList, parseOptCommaList,
         showFilePath, showToken, showTestedWith, showFreeText, parseFreeText,
         field, simpleField, simpleNestedField, listField, spaceListField, commaListField,
-        optsField, liftField, boolField, parseQuoted,
+        optsField, liftField, boolField, parseQuoted, indentWith,
 
         UnrecFieldParser, warnUnrec, ignoreUnrec,
   ) where
@@ -75,7 +75,6 @@ import Distribution.Package     ( PackageName(..), Dependency(..) )
 import Distribution.ModuleName (ModuleName)
 import Distribution.Compat.ReadP as ReadP hiding (get)
 import Distribution.ReadE
-import Distribution.PackageDescription.PrettyPrintIndent (indentWith)
 import Distribution.Text
          ( Text(..) )
 import Distribution.Simple.Utils
@@ -761,3 +760,7 @@ lines_ s                 =  let (l, s') = break (== '\n') s
                             in  l : case s' of
                                         []    -> []
                                         (_:s'') -> lines_ s''
+
+-- | the indentation used for pretty printing
+indentWith :: Int
+indentWith = 4