Drop debug

Author: angerman

Cabal/src/Distribution/Simple/PackageIndex.hs

@@ -169,7 +169,6 @@ instance Semigroup (PackageIndex IPI.InstalledPackageInfo) where
 {-# NOINLINE invariant #-}
 invariant :: WithCallStack (InstalledPackageIndex -> Bool)
 invariant (PackageIndex pids pnames) =
-  trace (show pids' ++ "\n" ++ show pnames') $
   pids' == pnames'
   where
     pids' = map installedUnitId (Map.elems pids)
@@ -335,7 +334,7 @@ deleteSourcePackageId pkgid original@(PackageIndex pids pnames) =
     Just pvers -> case Map.lookup (packageVersion pkgid) pvers of
       Nothing -> original
       Just pkgs ->
-        traceShow (pkgid, pkgs) $ mkPackageIndex
+        mkPackageIndex
           (foldl' (flip (Map.delete . installedUnitId)) pids pkgs)
 --          (Map.update deletePkgInstance (installedUnitId pkgid) pids)
           (deletePkgName pnames)

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

@@ -81,7 +81,7 @@ showCP (CP qpi fa es ds) =
 -- solver. Performs the necessary translations before and after.
 modularResolver :: SolverConfig -> DependencyResolver loc
 modularResolver sc toolchains biidx iidx sidx pkgConfigDB pprefs pcs pns = do
-    (assignment, revdepmap) <- solve' sc toolchains (trace (showIdx idx) idx) pkgConfigDB pprefs gcs pns
+    (assignment, revdepmap) <- solve' sc toolchains idx pkgConfigDB pprefs gcs pns
     let cp = toCPs assignment revdepmap
     Step (show (vcat (map showCP cp))) $
         return $ postprocess assignment revdepmap

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

@@ -63,13 +63,11 @@ convPIs :: Toolchains -> Map PN [LabeledPackageConstraint]
         -> CI.PackageIndex (SourcePackage loc)
         -> Index
 convPIs toolchains constraints sip strfl solveExes biidx iidx sidx =
-  mkIndex $ (trace (pp "BIPIs" bipis) bipis) ++ (trace (pp "HIPIs" hipis) hipis) ++ (trace (pp "SPIs" spis) spis)
+  mkIndex $ bipis ++ hipis ++ spis
   where bipis = convIPI' toolchains sip biidx
         hipis = convIPI' toolchains sip iidx
         ipis = bipis ++ hipis
         spis = convSPI' toolchains constraints strfl solveExes sidx
-        pp :: String -> [(PN, I, PInfo)] -> String
-        pp label xs = unlines $ ("=== " ++ label ++ ":\n"):(map (\(pn, i, pi) -> show pn ++ " " ++ show i) xs)
 
 -- | Convert a Cabal installed package index to the simpler,
 -- more uniform index format of the solver.
@@ -158,7 +156,7 @@ convIP toolchains idx ipi =
 convIPId :: Toolchains -> DependencyReason PN -> Component -> SI.InstalledPackageIndex -> UnitId -> Either UnitId (FlaggedDep PN)
 convIPId toolchains dr comp idx ipid =
   case SI.lookupUnitId idx ipid of
-    Nothing  -> traceShow (show comp ++ ": Failed to find: " ++ show ipid ++ " in index.") $ Left ipid
+    Nothing  -> Left ipid
     Just ipi -> let (pn, i) = convId toolchains ipi
                     name = ExposedLib LMainLibName  -- TODO: Handle sub-libraries.
                 in  Right (D.Simple (LDep dr (Dep (PkgComponent pn name) (Fixed i))) comp)

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

@@ -105,7 +105,7 @@ solve sc toolchains idx pkgConfigDB userPrefs userConstraints userGoals =
   traceTree "cycles.json" id .
   detectCycles      .
   traceTree "heuristics.json" id .
-  stageBuildDeps "post-pref: " .
+  -- stageBuildDeps "post-pref: " .
   trav (
    heuristicsPhase  .
    preferencesPhase .
@@ -115,9 +115,9 @@ solve sc toolchains idx pkgConfigDB userPrefs userConstraints userGoals =
   validationCata    .
   traceTree "pruned.json" id .
   trav prunePhase   .
-  stageBuildDeps "post-prune: " .
+  -- stageBuildDeps "post-prune: " .
   (if buildIsHost toolchains then id else trav P.pruneHostFromSetup) .
-  stageBuildDeps "build: " .
+  -- stageBuildDeps "build: " .
   traceTree "build.json" id $
   buildPhase
   where

cabal-install/src/Distribution/Client/Dependency.hs

@@ -935,25 +935,12 @@ validateSolverResult
   -> [ResolverPackage UnresolvedPkgLoc]
   -> SolverInstallPlan
 validateSolverResult toolchains indepGoals pkgs =
-  case planPackagesProblems toolchains (trace (dump pkgs) pkgs) of
+  case planPackagesProblems toolchains pkgs of
     [] -> case SolverInstallPlan.new indepGoals graph of
       Right plan -> plan
       Left problems -> error (formatPlanProblems problems)
     problems -> error (formatPkgProblems problems)
   where
-    dump :: [ResolverPackage UnresolvedPkgLoc] -> String
-    dump xs = unlines $
-      "=== DUMP ===":[unlines $ (resolverPkgHead x ++ show (packageId x)):[ "- "++ solverIdHead y ++ show (solverSrcId y)
-                                                                        | y <- CD.flatDeps (resolverPackageLibDeps x)]
-                     | x <- xs ]
-      ++ ["=== /DUMP =="]
-
-    solverIdHead :: SolverId -> String
-    solverIdHead (PreExistingId{}) = "[PE]"
-    solverIdHead (PlannedId    {}) = "[PL]"
-
-    resolverPkgHead (PreExisting _) = "[PE]"
-    resolverPkgHead (Configured  _) = "[CF]"
 
     graph :: Graph.Graph (ResolverPackage UnresolvedPkgLoc)
     graph = Graph.fromDistinctList pkgs

cabal-install/src/Distribution/Client/ProjectOrchestration.hs

@@ -659,8 +659,7 @@ resolveTargets
       checkTarget bt@(TargetPackage _ (ordNub -> [pkgid]) mkfilter)
         | Just ats <-
             fmap (maybe id filterTargetsKind mkfilter) $
-              (trace (unlines $ ("Failed to find " ++ prettyShow pkgid ++ " in "):[prettyShow k {-# ++ " -> " ++ show v #-} | (k,v) <- Map.toList availableTargetsByPackageId])
-                (Map.lookup pkgid availableTargetsByPackageId)) =
+                (Map.lookup pkgid availableTargetsByPackageId) =
             fmap (componentTargets WholeComponent) $
               selectPackageTargets bt ats
         | otherwise =
@@ -689,11 +688,10 @@ resolveTargets
             -- FIXME: this is stupid. We do not know what the target selectors HOST compiler is...
             --        so we'll assume tere is only a _SINGLE_ match in the map if we ignore the pkgCompiler.
             -- This lookup is now O(n) instead of O(log n).
-            (trace (unlines $ ("Failed to find " ++ prettyShow pkgid ++ ":" ++ show cname ++ " in "):[prettyShow k ++ ":" ++ show k' {-# ++ " -> " ++ show v #-} | ((k,k'),v) <- Map.toList availableTargetsByPackageIdAndComponentName])
               (case [v | ((k,k'),v) <- Map.toList availableTargetsByPackageIdAndComponentName
                       , k{pkgCompiler = Nothing} == pkgid
                       , k' == cname] of
-                [match] -> Just match))
+                [match] -> Just match)
               -- (Map.lookup
               --   (pkgid, cname)
               --   availableTargetsByPackageIdAndComponentName))

cabal-install/src/Distribution/Client/ProjectPlanning.hs

@@ -849,14 +849,14 @@ rebuildInstallPlan
 
               liftIO $ do
                 notice verbosity "Resolving dependencies..."
-                putStrLn "== installedPackages"
-                putStrLn $ unlines $ map (prettyShow . IPI.sourcePackageId) $ PI.allPackages installedPackages
-                putStrLn "== binstalledPackages"
-                putStrLn $ unlines $ map (prettyShow . IPI.sourcePackageId) $ PI.allPackages binstalledPkgIndex
-                putStrLn "== hinstalledPackages"
-                putStrLn $ unlines $ map (prettyShow . IPI.sourcePackageId) $ PI.allPackages hinstalledPkgIndex
-                putStrLn "== localPackages"
-                putStrLn $ unlines . map (prettyShow . srcpkgPackageId) $ [pkg | SpecificSourcePackage pkg <- localPackages]
+                -- putStrLn "== installedPackages"
+                -- putStrLn $ unlines $ map (prettyShow . IPI.sourcePackageId) $ PI.allPackages installedPackages
+                -- putStrLn "== binstalledPackages"
+                -- putStrLn $ unlines $ map (prettyShow . IPI.sourcePackageId) $ PI.allPackages binstalledPkgIndex
+                -- putStrLn "== hinstalledPackages"
+                -- putStrLn $ unlines $ map (prettyShow . IPI.sourcePackageId) $ PI.allPackages hinstalledPkgIndex
+                -- putStrLn "== localPackages"
+                -- putStrLn $ unlines . map (prettyShow . srcpkgPackageId) $ [pkg | SpecificSourcePackage pkg <- localPackages]
                 planOrError <-
                   foldProgress logMsg (pure . Left) (pure . Right) $
                     planPackages
@@ -1782,7 +1782,7 @@ elaborateInstallPlan
             let src_comps = componentsGraphToList g
             infoProgress $
               hang
-                (text "Component graph for" <+> pretty pkgid <+> text "at stage " <+> text (show $ elabStage elab0) <<>> colon)
+                (text "Component graph for" <+> pretty pkgid <<>> colon)
                 4
                 (dispComponentsWithDeps src_comps)
             (_, comps) <-
@@ -1973,7 +1973,7 @@ elaborateInstallPlan
                       elab0
                         { elabPkgOrComp = ElabComponent $ elab_comp
                         }
-                    cid = case traceShow (elabBuildStyle elab0) (elabBuildStyle elab0) of
+                    cid = case elabBuildStyle elab0 of
                       BuildInplaceOnly{} ->
                         mkComponentId $
                           prettyShow pkgid
@@ -2363,7 +2363,7 @@ elaborateInstallPlan
             elabPkgSourceLocation = srcloc
             elabPkgSourceHash = case Map.lookup pkgid sourcePackageHashes of
               Just h -> Just h
-              Nothing -> trace (unlines $ ("failed to find " ++ prettyShow pkgid ++ " in "):[ prettyShow k ++ " -> " ++ show v | (k, v) <- Map.toList sourcePackageHashes]) Nothing
+              Nothing -> Nothing
             elabLocalToProject = isLocalToProject pkg
             elabBuildStyle =
               if shouldBuildInplaceOnly pkg
@@ -2551,7 +2551,7 @@ elaborateInstallPlan
       shouldBuildInplaceOnly pkg =
         Set.member
           (packageId pkg)
-          (traceShowId pkgsToBuildInplaceOnly)
+          pkgsToBuildInplaceOnly
 
 
       -- FIXME: This change is stupid, however the previous assumption is