Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Open sidebar
Glasgow Haskell Compiler
Packages
Cabal
Commits
77ccb23c
Commit
77ccb23c
authored
Mar 21, 2014
by
Daniel Trstenjak
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove module 'PrettyPrintIndent' and move function 'indentWith' into module 'ParseUtils'
parent
73dd1c26
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
6 additions
and
13 deletions
+6
-13
Cabal/Cabal.cabal
Cabal/Cabal.cabal
+0
-1
Cabal/Distribution/PackageDescription/PrettyPrint.hs
Cabal/Distribution/PackageDescription/PrettyPrint.hs
+1
-2
Cabal/Distribution/PackageDescription/PrettyPrintIndent.hs
Cabal/Distribution/PackageDescription/PrettyPrintIndent.hs
+0
-8
Cabal/Distribution/ParseUtils.hs
Cabal/Distribution/ParseUtils.hs
+5
-2
No files found.
Cabal/Cabal.cabal
View file @
77ccb23c
...
...
@@ -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
View file @
77ccb23c
...
...
@@ -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
deleted
100644 → 0
View file @
73dd1c26
module
Distribution.PackageDescription.PrettyPrintIndent
(
indentWith
)
where
-- | the indentation used for pretty printing
indentWith
::
Int
indentWith
=
4
Cabal/Distribution/ParseUtils.hs
View file @
77ccb23c
...
...
@@ -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
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment