Show flag setting in FailReason

Author: philderbeast

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

@@ -56,6 +56,7 @@ import Distribution.Types.UnqualComponentName
     ( unUnqualComponentName )
 
 import Text.PrettyPrint ( nest, render )
+import Distribution.Solver.Types.Settings (OnlyConstrained(..))
 
 -- A data type to hold log information from the modular solver.
 data Message =
@@ -311,7 +312,7 @@ showFR _ (PackageRequiresMissingComponent qpn comp) = " (requires " ++ showExpos
 showFR _ (PackageRequiresPrivateComponent qpn comp) = " (requires " ++ showExposedComponent comp ++ " from " ++ showQPN qpn ++ ", but the component is private)"
 showFR _ (PackageRequiresUnbuildableComponent qpn comp) = " (requires " ++ showExposedComponent comp ++ " from " ++ showQPN qpn ++ ", but the component is not buildable in the current environment)"
 showFR _ CannotReinstall                  = " (avoiding to reinstall a package with same version but new dependencies)"
-showFR _ NotExplicit                      = " (not a user-provided goal nor mentioned as a constraint, but reject-unconstrained-dependencies was set)"
+showFR _ (NotExplicit oc)                 = showNotExplicit oc
 showFR _ Shadowed                         = " (shadowed by another installed package with same version)"
 showFR _ (Broken u)                       = " (package is broken, missing dependency " ++ prettyShow u ++ ")"
 showFR _ UnknownPackage                   = " (unknown package)"
@@ -334,6 +335,11 @@ showFR _ (MalformedFlagChoice qfn)        = " (INTERNAL ERROR: MALFORMED FLAG CH
 showFR _ (MalformedStanzaChoice qsn)      = " (INTERNAL ERROR: MALFORMED STANZA CHOICE: " ++ showQSN qsn ++ ")"
 showFR _ EmptyGoalChoice                  = " (INTERNAL ERROR: EMPTY GOAL CHOICE)"
 
+showNotExplicit :: OnlyConstrained -> String
+showNotExplicit oc = if oc == OnlyConstrainedNone
+  then " (INTERNAL ERROR: NOT EXPLICIT when reject-unconstrained-dependencies=" ++ prettyShow oc ++ " was set)"
+  else " (not a user-provided goal nor mentioned as a constraint, but reject-unconstrained-dependencies=" ++ prettyShow oc ++ " was set)"
+
 showExposedComponent :: ExposedComponent -> String
 showExposedComponent (ExposedLib LMainLibName)       = "library"
 showExposedComponent (ExposedLib (LSubLibName name)) = "library '" ++ unUnqualComponentName name ++ "'"

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

@@ -43,6 +43,7 @@ import Distribution.Solver.Modular.Tree
 import Distribution.Solver.Modular.Version
 import qualified Distribution.Solver.Modular.ConflictSet as CS
 import qualified Distribution.Solver.Modular.WeightedPSQ as W
+import Distribution.Solver.Types.Settings (OnlyConstrained(..))
 
 -- | Update the weights of children under 'PChoice' nodes. 'addWeights' takes a
 -- list of weight-calculating functions in order to avoid sorting the package
@@ -351,13 +352,13 @@ avoidReinstalls p = go
     go x          = x
 
 -- | Require all packages to be mentioned in a constraint or as a goal.
-onlyConstrained :: (PN -> Bool) -> EndoTreeTrav d QGoalReason
-onlyConstrained p = go
+onlyConstrained :: OnlyConstrained -> (PN -> Bool) -> EndoTreeTrav d QGoalReason
+onlyConstrained oc p = go
   where
     go (PChoiceF v@(Q _ pn) _ gr _) | not (p pn)
       = FailF
         (varToConflictSet (P v) `CS.union` goalReasonToConflictSetWithConflict v gr)
-        NotExplicit
+        (NotExplicit oc)
     go x
       = x
 

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

@@ -1,4 +1,5 @@
 {-# LANGUAGE CPP #-}
+{-# LANGUAGE LambdaCase #-}
 #ifdef DEBUG_TRACETREE
 {-# LANGUAGE FlexibleInstances #-}
 {-# OPTIONS_GHC -Wno-orphans #-}
@@ -11,6 +12,7 @@ module Distribution.Solver.Modular.Solver
 
 import Distribution.Solver.Compat.Prelude
 import Prelude ()
+import Data.Function ((&))
 
 import qualified Data.Map as M
 import qualified Data.List as L
@@ -141,9 +143,9 @@ solve sc cinfo idx pkgConfigDB userPrefs userConstraints userGoals =
                        validateLinking idx .
                        validateTree cinfo idx pkgConfigDB
     prunePhase       = (if asBool (avoidReinstalls sc) then P.avoidReinstalls (const True) else id) .
-                       (case onlyConstrained sc of
-                          OnlyConstrainedEq -> P.onlyConstrained (`S.member` allExplicitEq)
-                          OnlyConstrainedAll -> P.onlyConstrained (`S.member` allExplicit)
+                       (let oc = onlyConstrained sc in oc & \case
+                          OnlyConstrainedEq -> P.onlyConstrained oc (`S.member` allExplicitEq)
+                          OnlyConstrainedAll -> P.onlyConstrained oc (`S.member` allExplicit)
                           OnlyConstrainedNone -> id)
     buildPhase       = buildTree idx (independentGoals sc) (S.toList userGoals)
 

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

@@ -36,6 +36,7 @@ import Distribution.Solver.Types.PackagePath
 import Distribution.Types.PkgconfigVersionRange
 import Distribution.Types.UnitId (UnitId)
 import Language.Haskell.Extension (Extension, Language)
+import Distribution.Solver.Types.Settings (OnlyConstrained(..))
 
 type Weight = Double
 
@@ -112,7 +113,7 @@ data FailReason = UnsupportedExtension Extension
                 | PackageRequiresPrivateComponent QPN ExposedComponent
                 | PackageRequiresUnbuildableComponent QPN ExposedComponent
                 | CannotReinstall
-                | NotExplicit
+                | NotExplicit OnlyConstrained
                 | Shadowed
                 | Broken UnitId
                 | UnknownPackage

cabal-testsuite/PackageTests/RequireExplicit/MultiPkg/cabal.multipkg-all.out

@@ -6,7 +6,7 @@ Error: [Cabal-7107]
 Could not resolve dependencies:
 [__0] trying: b-0 (user goal)
 [__1] next goal: other-lib (dependency of b)
-[__1] fail (not a user-provided goal nor mentioned as a constraint, but reject-unconstrained-dependencies was set)
+[__1] fail (not a user-provided goal nor mentioned as a constraint, but reject-unconstrained-dependencies=all was set)
 [__1] fail (backjumping, conflict set: b, other-lib)
 After searching the rest of the dependency tree exhaustively, these were the goals I've had most trouble fulfilling: b (2), other-lib (1)
 # cabal build
@@ -15,7 +15,7 @@ Error: [Cabal-7107]
 Could not resolve dependencies:
 [__0] trying: b-0 (user goal)
 [__1] next goal: b:some-exe:exe.some-exe (dependency of b)
-[__1] fail (not a user-provided goal nor mentioned as a constraint, but reject-unconstrained-dependencies was set)
+[__1] fail (not a user-provided goal nor mentioned as a constraint, but reject-unconstrained-dependencies=all was set)
 [__1] fail (backjumping, conflict set: b, b:some-exe:exe.some-exe)
 After searching the rest of the dependency tree exhaustively, these were the goals I've had most trouble fulfilling: b (2), b:some-exe:exe.some-exe (1)
 # cabal build

cabal-testsuite/PackageTests/RequireExplicit/MultiPkg/cabal.multipkg-eq.out

@@ -24,6 +24,6 @@ Error: [Cabal-7107]
 Could not resolve dependencies:
 [__0] trying: a-0 (user goal)
 [__1] next goal: some-lib (dependency of a)
-[__1] fail (not a user-provided goal nor mentioned as a constraint, but reject-unconstrained-dependencies was set)
+[__1] fail (not a user-provided goal nor mentioned as a constraint, but reject-unconstrained-dependencies=eq was set)
 [__1] fail (backjumping, conflict set: a, some-lib)
 After searching the rest of the dependency tree exhaustively, these were the goals I've had most trouble fulfilling: a (2), some-lib (1)

cabal-testsuite/PackageTests/RequireExplicit/MultiPkg/cabal.test.hs

@@ -2,7 +2,7 @@ import Test.Cabal.Prelude
 
 -- See #4332, dep solving output is not deterministic
 
-assertErr = assertOutputContains "not a user-provided goal nor mentioned as a constraint, but reject-unconstrained-dependencies was set"
+assertErr x = assertOutputContains ("not a user-provided goal nor mentioned as a constraint, but reject-unconstrained-dependencies=" ++ x ++ " was set")
 
 constraint x = "--constraint=" ++ x
 
@@ -15,12 +15,11 @@ main = do
 
     -- other-lib is a dependency of b, but it's not listed in cabal.project
     res <- fails $ cabal' "build" ("all" : opts ++ [constraint "some-exe -any"])
-    assertErr res
+    assertErr "all" res
 
     -- and some-exe is a build-tool dependency of b, again not listed
     res <- fails $ cabal' "build" ("all" : opts ++ [constraint "other-lib -any"])
-    assertErr res
-
+    assertErr "all" res
     -- everything's listed, good to go
     cabal "build" $
       "all"
@@ -65,4 +64,4 @@ main = do
           ++ [ constraint "some-lib >0"
              , constraint "some-lib <2"
              ]
-    assertErr res
+    assertErr "eq" res