Skip to content

Commit 47ddffa

Browse files
committed
Remove awkward and unnecessary CLI flag
1 parent 4b7f4e1 commit 47ddffa

File tree

1 file changed

+5
-16
lines changed

1 file changed

+5
-16
lines changed

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

Lines changed: 5 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ module Distribution.Client.CmdShowBuildInfo (
88
) where
99

1010
import Distribution.Client.Compat.Prelude
11-
(catMaybes, fromMaybe )
11+
( catMaybes )
1212
import Distribution.Client.ProjectOrchestration
1313
import Distribution.Client.CmdErrorMessages
1414
import Distribution.Client.TargetProblem
@@ -23,11 +23,7 @@ import Distribution.Simple.Command
2323
import Distribution.Verbosity
2424
(Verbosity, silent )
2525
import Distribution.Simple.Utils
26-
(wrapText, die' )
27-
import Distribution.Types.UnitId
28-
( mkUnitId )
29-
import Distribution.Pretty
30-
( prettyShow )
26+
(wrapText )
3127

3228
import qualified Data.Map as Map
3329
import qualified Distribution.Simple.Setup as Cabal
@@ -36,12 +32,11 @@ import Distribution.Client.ProjectPlanning.Types
3632
import Distribution.Client.NixStyleOptions
3733
( NixStyleFlags (..), nixStyleOptions, defaultNixStyleFlags )
3834
import Distribution.Client.DistDirLayout
39-
(distProjectRootDirectory )
35+
( distProjectRootDirectory )
4036

4137
import Distribution.Simple.ShowBuildInfo
4238
import Distribution.Utils.Json
4339

44-
import Control.Monad (forM_, unless)
4540
import Data.Either
4641
import qualified Data.Text as T
4742
import qualified Data.Text.IO as T
@@ -66,31 +61,25 @@ showBuildInfoCommand = CommandUI {
6661
[ option [] ["buildinfo-json-output"]
6762
"Write the result to the given file instead of stdout"
6863
buildInfoOutputFile (\pf flags -> flags { buildInfoOutputFile = pf })
69-
(reqArg' "FILE" Just (maybe [] pure)),
70-
option [] ["unit-ids-json"]
71-
"Show build-info only for selected unit-id's."
72-
buildInfoUnitIds (\pf flags -> flags { buildInfoUnitIds = pf })
73-
(reqArg' "UNIT-ID" (Just . words) (fromMaybe []))
64+
(reqArg' "FILE" Just (maybe [] pure))
7465
],
7566
commandDefaultFlags = defaultNixStyleFlags defaultShowBuildInfoFlags
7667
}
7768

7869
data ShowBuildInfoFlags = ShowBuildInfoFlags
7970
{ buildInfoOutputFile :: Maybe FilePath
80-
, buildInfoUnitIds :: Maybe [String]
8171
}
8272

8373
defaultShowBuildInfoFlags :: ShowBuildInfoFlags
8474
defaultShowBuildInfoFlags = ShowBuildInfoFlags
8575
{ buildInfoOutputFile = Nothing
86-
, buildInfoUnitIds = Nothing
8776
}
8877

8978
-- | The @show-build-info@ exports information about a package and the compiler
9079
-- configuration used to build it as JSON, that can be used by other tooling.
9180
-- See "Distribution.Simple.ShowBuildInfo" for more information.
9281
showBuildInfoAction :: NixStyleFlags ShowBuildInfoFlags -> [String] -> GlobalFlags -> IO ()
93-
showBuildInfoAction flags@NixStyleFlags { extraFlags = (ShowBuildInfoFlags fileOutput unitIdStrs), ..}
82+
showBuildInfoAction flags@NixStyleFlags { extraFlags = (ShowBuildInfoFlags fileOutput), ..}
9483
targetStrings globalFlags = do
9584
baseCtx <- establishProjectBaseContext verbosity cliConfig OtherCommand
9685

0 commit comments

Comments
 (0)