Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
C
Cabal
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Analyze
Contributor analytics
CI/CD analytics
Repository analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Glasgow Haskell Compiler
Packages
Cabal
Commits
12c3490c
Commit
12c3490c
authored
10 years ago
by
Daniel Trstenjak
Committed by
tibbe
10 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Remove 'condTreeConstraints' field from pretty printing
See #2323 for the details. (cherry picked from commit
370f135a
)
parent
d3617da7
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
Cabal/Distribution/PackageDescription/PrettyPrint.hs
+2
-8
2 additions, 8 deletions
Cabal/Distribution/PackageDescription/PrettyPrint.hs
with
2 additions
and
8 deletions
Cabal/Distribution/PackageDescription/PrettyPrint.hs
+
2
−
8
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
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment