Commit 77ccb23c authored by Daniel Trstenjak's avatar Daniel Trstenjak
Browse files

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

parent 73dd1c26
...@@ -151,7 +151,6 @@ library ...@@ -151,7 +151,6 @@ library
Distribution.PackageDescription.Configuration Distribution.PackageDescription.Configuration
Distribution.PackageDescription.Parse Distribution.PackageDescription.Parse
Distribution.PackageDescription.PrettyPrint Distribution.PackageDescription.PrettyPrint
Distribution.PackageDescription.PrettyPrintIndent
Distribution.PackageDescription.Utils Distribution.PackageDescription.Utils
Distribution.ParseUtils Distribution.ParseUtils
Distribution.ReadE Distribution.ReadE
......
...@@ -59,12 +59,11 @@ import Text.PrettyPrint ...@@ -59,12 +59,11 @@ import Text.PrettyPrint
(hsep, comma, punctuate, parens, char, nest, empty, (hsep, comma, punctuate, parens, char, nest, empty,
isEmpty, ($$), (<+>), colon, (<>), text, vcat, ($+$), Doc, render) isEmpty, ($$), (<+>), colon, (<>), text, vcat, ($+$), Doc, render)
import Distribution.Simple.Utils (writeUTF8File) import Distribution.Simple.Utils (writeUTF8File)
import Distribution.ParseUtils (showFreeText, FieldDescr(..)) import Distribution.ParseUtils (showFreeText, FieldDescr(..), indentWith)
import Distribution.PackageDescription.Parse (pkgDescrFieldDescrs,binfoFieldDescrs,libFieldDescrs, import Distribution.PackageDescription.Parse (pkgDescrFieldDescrs,binfoFieldDescrs,libFieldDescrs,
sourceRepoFieldDescrs) sourceRepoFieldDescrs)
import Distribution.Package (Dependency(..)) import Distribution.Package (Dependency(..))
import Distribution.Text (Text(..)) import Distribution.Text (Text(..))
import Distribution.PackageDescription.PrettyPrintIndent (indentWith)
import Data.Maybe (isJust, fromJust, isNothing) import Data.Maybe (isJust, fromJust, isNothing)
-- | Recompile with false for regression testing -- | Recompile with false for regression testing
......
module Distribution.PackageDescription.PrettyPrintIndent
( indentWith
) where
-- | the indentation used for pretty printing
indentWith :: Int
indentWith = 4
...@@ -62,7 +62,7 @@ module Distribution.ParseUtils ( ...@@ -62,7 +62,7 @@ module Distribution.ParseUtils (
parseSepList, parseCommaList, parseOptCommaList, parseSepList, parseCommaList, parseOptCommaList,
showFilePath, showToken, showTestedWith, showFreeText, parseFreeText, showFilePath, showToken, showTestedWith, showFreeText, parseFreeText,
field, simpleField, simpleNestedField, listField, spaceListField, commaListField, field, simpleField, simpleNestedField, listField, spaceListField, commaListField,
optsField, liftField, boolField, parseQuoted, optsField, liftField, boolField, parseQuoted, indentWith,
UnrecFieldParser, warnUnrec, ignoreUnrec, UnrecFieldParser, warnUnrec, ignoreUnrec,
) where ) where
...@@ -75,7 +75,6 @@ import Distribution.Package ( PackageName(..), Dependency(..) ) ...@@ -75,7 +75,6 @@ import Distribution.Package ( PackageName(..), Dependency(..) )
import Distribution.ModuleName (ModuleName) import Distribution.ModuleName (ModuleName)
import Distribution.Compat.ReadP as ReadP hiding (get) import Distribution.Compat.ReadP as ReadP hiding (get)
import Distribution.ReadE import Distribution.ReadE
import Distribution.PackageDescription.PrettyPrintIndent (indentWith)
import Distribution.Text import Distribution.Text
( Text(..) ) ( Text(..) )
import Distribution.Simple.Utils import Distribution.Simple.Utils
...@@ -761,3 +760,7 @@ lines_ s = let (l, s') = break (== '\n') s ...@@ -761,3 +760,7 @@ lines_ s = let (l, s') = break (== '\n') s
in l : case s' of in l : case s' of
[] -> [] [] -> []
(_:s'') -> lines_ s'' (_:s'') -> lines_ s''
-- | the indentation used for pretty printing
indentWith :: Int
indentWith = 4
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment