From 77ccb23cd5342dc0715e50353a9f707092b19cd1 Mon Sep 17 00:00:00 2001
From: Daniel Trstenjak <daniel.trstenjak@gmail.com>
Date: Fri, 21 Mar 2014 19:17:19 +0100
Subject: [PATCH] Remove module 'PrettyPrintIndent' and move function
'indentWith' into module 'ParseUtils'
---
Cabal/Cabal.cabal | 1 -
Cabal/Distribution/PackageDescription/PrettyPrint.hs | 3 +--
.../Distribution/PackageDescription/PrettyPrintIndent.hs | 8 --------
Cabal/Distribution/ParseUtils.hs | 7 +++++--
4 files changed, 6 insertions(+), 13 deletions(-)
delete mode 100644 Cabal/Distribution/PackageDescription/PrettyPrintIndent.hs
diff --git a/Cabal/Cabal.cabal b/Cabal/Cabal.cabal
index d84177faa3..d01caf5e75 100644
--- a/Cabal/Cabal.cabal
+++ b/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
diff --git a/Cabal/Distribution/PackageDescription/PrettyPrint.hs b/Cabal/Distribution/PackageDescription/PrettyPrint.hs
index 18ee00b4db..7c4008f6e6 100644
--- a/Cabal/Distribution/PackageDescription/PrettyPrint.hs
+++ b/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
diff --git a/Cabal/Distribution/PackageDescription/PrettyPrintIndent.hs b/Cabal/Distribution/PackageDescription/PrettyPrintIndent.hs
deleted file mode 100644
index 8916293fcf..0000000000
--- a/Cabal/Distribution/PackageDescription/PrettyPrintIndent.hs
+++ /dev/null
@@ -1,8 +0,0 @@
-
-module Distribution.PackageDescription.PrettyPrintIndent
- ( indentWith
- ) where
-
--- | the indentation used for pretty printing
-indentWith :: Int
-indentWith = 4
diff --git a/Cabal/Distribution/ParseUtils.hs b/Cabal/Distribution/ParseUtils.hs
index d61b346782..e4b039e34a 100644
--- a/Cabal/Distribution/ParseUtils.hs
+++ b/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
--
GitLab