Skip to content

Commit fd62364

Browse files
gbazmergify-bot
authored and
mergify-bot
committed
set package index asserts expensive
(cherry picked from commit 8befafd)
1 parent 28d2d70 commit fd62364

File tree

1 file changed

+4
-4
lines changed
  • cabal-install/cabal-install-solver/src/Distribution/Solver/Types

1 file changed

+4
-4
lines changed

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,11 @@ module Distribution.Solver.Types.PackageIndex (
5050
import Prelude ()
5151
import Distribution.Solver.Compat.Prelude hiding (lookup)
5252

53-
import Control.Exception (assert)
5453
import qualified Data.Map as Map
5554
import Data.List (isInfixOf)
5655
import qualified Data.List.NonEmpty as NE
5756

57+
import Distribution.Client.Utils.Assertion ( expensiveAssert )
5858
import Distribution.Package
5959
( PackageName, unPackageName, PackageIdentifier(..)
6060
, Package(..), packageName, packageVersion )
@@ -110,7 +110,7 @@ invariant (PackageIndex m) = all (uncurry goodBucket) (Map.toList m)
110110
--
111111

112112
mkPackageIndex :: Package pkg => Map PackageName [pkg] -> PackageIndex pkg
113-
mkPackageIndex index = assert (invariant (PackageIndex index))
113+
mkPackageIndex index = expensiveAssert (invariant (PackageIndex index))
114114
(PackageIndex index)
115115

116116
internalError :: String -> a
@@ -157,7 +157,7 @@ fromList pkgs = mkPackageIndex
157157
--
158158
merge :: Package pkg => PackageIndex pkg -> PackageIndex pkg -> PackageIndex pkg
159159
merge i1@(PackageIndex m1) i2@(PackageIndex m2) =
160-
assert (invariant i1 && invariant i2) $
160+
expensiveAssert (invariant i1 && invariant i2) $
161161
mkPackageIndex (Map.unionWith mergeBuckets m1 m2)
162162

163163

@@ -178,7 +178,7 @@ mergeBuckets xs@(x:xs') ys@(y:ys') =
178178
--
179179
override :: Package pkg => PackageIndex pkg -> PackageIndex pkg -> PackageIndex pkg
180180
override i1@(PackageIndex m1) i2@(PackageIndex m2) =
181-
assert (invariant i1 && invariant i2) $
181+
expensiveAssert (invariant i1 && invariant i2) $
182182
mkPackageIndex (Map.unionWith (\_l r -> r) m1 m2)
183183

184184
-- | Inserts a single package into the index.

0 commit comments

Comments
 (0)