Skip to content

Commit 6a1157e

Browse files
committed
Reinstate some reverse operations in displayMessage.
Also remove an `L.sort` I had added n `showOptions` in an attempt to regularize solver messages.
1 parent ef50d79 commit 6a1157e

File tree

1 file changed

+3
-3
lines changed
  • cabal-install-solver/src/Distribution/Solver/Modular

1 file changed

+3
-3
lines changed

cabal-install-solver/src/Distribution/Solver/Modular/Message.hs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ summarizeMessages = go 0
159159
-- By prepending (i : is) we reverse the order of the instances.
160160
goPReject l qpn (i : is) c fr ms
161161
goPReject l qpn is c fr ms =
162-
Step (SummarizedMsg $ AtLevel l $ (EntryRejectMany qpn is c fr)) (go l ms)
162+
Step (SummarizedMsg $ AtLevel l $ (EntryRejectMany qpn (reverse is) c fr)) (go l ms)
163163

164164
-- Handle many subsequent skipped package instances.
165165
goPSkip :: Int
@@ -173,7 +173,7 @@ summarizeMessages = go 0
173173
-- By prepending (i : is) we reverse the order of the instances.
174174
goPSkip l qpn (i : is) conflicts ms
175175
goPSkip l qpn is conflicts ms =
176-
Step (SummarizedMsg $ AtLevel l $ (EntrySkipMany qpn is conflicts)) (go l ms)
176+
Step (SummarizedMsg $ AtLevel l $ (EntrySkipMany qpn (reverse is) conflicts)) (go l ms)
177177

178178
-- | Display the set of 'Conflicts' for a skipped package version.
179179
showConflicts :: Set CS.Conflict -> String
@@ -291,7 +291,7 @@ showOptions q xs = showQPN q ++ "; " ++ (L.intercalate ", "
291291
[if isJust linkedTo
292292
then showOption q x
293293
else showI i -- Don't show the package, just the version
294-
| x@(POption i linkedTo) <- reverse xs
294+
| x@(POption i linkedTo) <- xs
295295
])
296296

297297
showGR :: QGoalReason -> String

0 commit comments

Comments
 (0)