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
12c3490c
Commit
12c3490c
authored
Jan 14, 2015
by
Daniel Trstenjak
Committed by
tibbe
Jan 17, 2015
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove 'condTreeConstraints' field from pretty printing
See #2323 for the details. (cherry picked from commit
370f135a
)
parent
d3617da7
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
8 deletions
+2
-8
Cabal/Distribution/PackageDescription/PrettyPrint.hs
Cabal/Distribution/PackageDescription/PrettyPrint.hs
+2
-8
No files found.
Cabal/Distribution/PackageDescription/PrettyPrint.hs
View file @
12c3490c
...
...
@@ -215,9 +215,8 @@ ppFlagName :: FlagName -> Doc
ppFlagName
(
FlagName
name
)
=
text
name
ppCondTree
::
CondTree
ConfVar
[
Dependency
]
a
->
Maybe
a
->
(
a
->
Maybe
a
->
Doc
)
->
Doc
ppCondTree
ct
@
(
CondNode
it
deps
ifs
)
mbIt
ppIt
=
let
res
=
ppDeps
deps
$+$
(
vcat
$
map
ppIf
ifs
)
ppCondTree
ct
@
(
CondNode
it
_
ifs
)
mbIt
ppIt
=
let
res
=
(
vcat
$
map
ppIf
ifs
)
$+$
ppIt
it
mbIt
in
if
isJust
mbIt
&&
isEmpty
res
then
ppCondTree
ct
Nothing
ppIt
...
...
@@ -234,11 +233,6 @@ ppCondTree ct@(CondNode it deps ifs) mbIt ppIt =
$$
nest
indentWith
(
ppCondTree
(
fromJust
mElseTree
)
(
if
simplifiedPrinting
then
(
Just
it
)
else
Nothing
)
ppIt
))
ppDeps
::
[
Dependency
]
->
Doc
ppDeps
[]
=
empty
ppDeps
deps
=
text
"build-depends:"
$+$
nest
indentWith
(
vcat
(
punctuate
comma
(
map
disp
deps
)))
emptyLine
::
Doc
->
Doc
emptyLine
d
=
text
""
$+$
d
...
...
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