Remove old cruft

Author: fendor

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

@@ -21,13 +21,9 @@ import Distribution.Simple.Setup
 import Distribution.Simple.Command
          ( CommandUI(..), option, reqArg', usageAlternatives )
 import Distribution.Verbosity
-         (Verbosity, silent )
+         ( Verbosity, silent )
 import Distribution.Simple.Utils
-         (wrapText, die' )
-import Distribution.Types.UnitId
-         ( mkUnitId )
-import Distribution.Pretty
-         ( prettyShow )
+         ( wrapText )
 
 import qualified Data.Map as Map
 import qualified Distribution.Simple.Setup as Cabal
@@ -41,7 +37,6 @@ import Distribution.Client.DistDirLayout
 import Distribution.Simple.ShowBuildInfo
 import Distribution.Utils.Json
 
-import Control.Monad (forM_, unless)
 import Data.Either
 import qualified Data.Text as T
 import qualified Data.Text.IO as T
@@ -93,36 +88,23 @@ showBuildInfoAction :: NixStyleFlags ShowBuildInfoFlags -> [String] -> GlobalFla
 showBuildInfoAction flags@NixStyleFlags { extraFlags = (ShowBuildInfoFlags fileOutput unitIdStrs), ..}
   targetStrings globalFlags = do
   baseCtx <- establishProjectBaseContext verbosity cliConfig OtherCommand
-  let baseCtx' = baseCtx
-        { buildSettings = (buildSettings baseCtx) { buildSettingDryRun = True }
-        }
 
   targetSelectors <- either (reportTargetSelectorProblems verbosity) return
-                  =<< readTargetSelectors (localPackages baseCtx') Nothing targetStrings
+                  =<< readTargetSelectors (localPackages baseCtx) Nothing targetStrings
 
   buildCtx <-
-    runProjectPreBuildPhase verbosity baseCtx' $ \elaboratedPlan -> do
+    runProjectPreBuildPhase verbosity baseCtx $ \elaboratedPlan -> do
       -- Interpret the targets on the command line as build targets
       -- (as opposed to say repl or haddock targets).
-
-      targets' <- either (reportShowBuildInfoTargetProblems verbosity) return
+      targets <- either (reportShowBuildInfoTargetProblems verbosity) return
                 $ resolveTargets
                     selectPackageTargets
                     selectComponentTarget
                     elaboratedPlan
                     Nothing
                     targetSelectors
 
-      let unitIds = map mkUnitId <$> unitIdStrs
-
-      -- Check that all the unit ids exist
-      forM_ (fromMaybe [] unitIds) $ \ui ->
-        unless (Map.member ui targets') $
-          die' verbosity ("No unit " ++ prettyShow ui)
-
-      -- Filter out targets that aren't in the specified unit ids
-      let targets = Map.filterWithKey (\k _ -> maybe True (elem k) unitIds) targets'
-          elaboratedPlan' = pruneInstallPlanToTargets
+      let elaboratedPlan' = pruneInstallPlanToTargets
                         TargetActionBuildInfo
                         targets
                         elaboratedPlan

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

@@ -2595,7 +2595,7 @@ nubComponentTargets =
                             -> [(ComponentTarget, NonEmpty a)]
     wholeComponentOverrides ts =
       case [ ta | ta@(ComponentTarget _ WholeComponent, _) <- ts ] of
-        ((t, x):_) -> 
+        ((t, x):_) ->
                 let
                     -- Delete tuple (t, x) from original list to avoid duplicates.
                     -- Use 'deleteBy', to avoid additional Class constraint on 'nubComponentTargets'.