Merge pull request #4153 from grayjay/revert-pr-4147

Revert "Solver: Add missing call to 'simplifyVar'."

Merge pull request #4153 from grayjay/revert-pr-4147
Revert "Solver: Add missing call to 'simplifyVar'."
01016785 · kristenk · GitHub · 90e48b57 · f5a981c6 · 01016785
Commit 01016785 authored Dec 06, 2016 by kristenk Committed by GitHub Dec 06, 2016
--- a/cabal-install/Distribution/Solver/Modular/Explore.hs
+++ b/cabal-install/Distribution/Solver/Modular/Explore.hs
@@ -72,7 +72,7 @@ getBestGoal :: ConflictMap -> P.PSQ (Goal QPN) a -> (Goal QPN, a)
 getBestGoal cm =
  P.maximumBy
    ( flip (M.findWithDefault 0) cm
-    . (\ (Goal v _) -> simplifyVar v)
+    . (\ (Goal v _) -> v)
    )

 getFirstGoal :: P.PSQ (Goal QPN) a -> (Goal QPN, a)