Skip to content

Commit 280683b

Browse files
committed
fixup! wip: thread compiler
1 parent 1a4cddb commit 280683b

File tree

1 file changed

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

1 file changed

+6
-6
lines changed

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -188,12 +188,12 @@ assign tree = go tree (A M.empty M.empty M.empty M.empty)
188188
go :: Tree d c -> Assignment -> Tree Assignment c
189189
go (Fail c fr) _ = Fail c fr
190190
go (Done rdm _) a = Done rdm a
191-
go (PChoice qpn rdm y ts) (A pa fa sa) = PChoice qpn rdm y $ W.mapWithKey f (fmap go ts)
192-
where f (POption k _) r = r (A (M.insert qpn k pa) fa sa)
193-
go (FChoice qfn rdm y t m d ts) (A pa fa sa) = FChoice qfn rdm y t m d $ W.mapWithKey f (fmap go ts)
194-
where f k r = r (A pa (M.insert qfn k fa) sa)
195-
go (SChoice qsn rdm y t ts) (A pa fa sa) = SChoice qsn rdm y t $ W.mapWithKey f (fmap go ts)
196-
where f k r = r (A pa fa (M.insert qsn k sa))
191+
go (PChoice qpn rdm y ts) (A pa ca fa sa) = PChoice qpn rdm y $ W.mapWithKey f (fmap go ts)
192+
where f (POption k _) r = r (A (M.insert qpn k pa) ca fa sa)
193+
go (FChoice qfn rdm y t m d ts) (A pa ca fa sa) = FChoice qfn rdm y t m d $ W.mapWithKey f (fmap go ts)
194+
where f k r = r (A pa ca (M.insert qfn k fa) sa)
195+
go (SChoice qsn rdm y t ts) (A pa ca fa sa) = SChoice qsn rdm y t $ W.mapWithKey f (fmap go ts)
196+
where f k r = r (A pa ca fa (M.insert qsn k sa))
197197
go (GoalChoice rdm ts) a = GoalChoice rdm $ fmap ($ a) (fmap go ts)
198198

199199
-- | A tree traversal that simultaneously propagates conflict sets up

0 commit comments

Comments
 (0)