Skip to content

Commit 08689b9

Browse files
committed
Fix test stanzas ignored thing
1 parent b3b1ff3 commit 08689b9

File tree

2 files changed

+5
-4
lines changed
  • cabal-install/tests/UnitTests/Distribution/Solver/Modular
  • cabal-install-solver/src/Distribution/Solver/Types

2 files changed

+5
-4
lines changed

cabal-install-solver/src/Distribution/Solver/Types/PackageConstraint.hs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,10 @@ data ConstraintScope
5252
-- | The package with the specified name and qualifier.
5353
| ScopeQualified Namespace Qualifier PackageName
5454

55-
-- ROMES:TODO: Should I try to delete this? It will not be easy because it will go down to the constraint syntax
56-
-- Apply a constraint to a private-build-depends scope
55+
-- TODO Better Comment: Apply a constraint to a private-build-depends scope
56+
-- It is not sufficient to have ScopeQualified because we don't have enough
57+
-- information in the constraint syntax to fill in the `Component` field of
58+
-- `QualAlias`
5759
| ScopePrivate PackageName PrivateAlias PackageName
5860
-- | The package with the specified name when it has a
5961
-- setup qualifier.
@@ -79,7 +81,6 @@ scopeToPackageName (ScopePrivate _ _ pn) = pn
7981

8082
-- TODO: Crucial (RM: Why did you write this Matthew?!)
8183
constraintScopeMatches :: ConstraintScope -> QPN -> Bool
82-
--constraintScopeMatches cs qpn | traceShow (cs, qpn) False = undefined
8384
constraintScopeMatches (ScopeTarget pn) (Q (PackagePath ns q) pn') =
8485
let namespaceMatches DefaultNamespace = True
8586
namespaceMatches (Independent namespacePn) = pn == namespacePn

cabal-install/tests/UnitTests/Distribution/Solver/Modular/DSL.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -871,7 +871,7 @@ exResolve
871871
fmap
872872
( \p ->
873873
PackageConstraint
874-
(scopeToplevel (C.mkPackageName p))
874+
(ScopeAnyQualifier (C.mkPackageName p))
875875
(PackagePropertyStanzas [TestStanzas])
876876
)
877877
(exDbPkgs db)

0 commit comments

Comments
 (0)