Skip to content

Commit

Permalink
Adopt coding style
Browse files Browse the repository at this point in the history
  • Loading branch information
fendor committed Mar 25, 2019
1 parent ba81d96 commit 1559b76
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 10 deletions.
2 changes: 1 addition & 1 deletion cabal-install/Distribution/Client/CmdShowBuildInfo.hs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
-- | cabal-install CLI command: build
-- | cabal-install CLI command: new-show-build-info
--
module Distribution.Client.CmdShowBuildInfo (
-- * The @show-build-info@ CLI and action
Expand Down
13 changes: 4 additions & 9 deletions cabal-install/main/Main.hs
Original file line number Diff line number Diff line change
Expand Up @@ -483,7 +483,7 @@ buildActionForCommand commandUI verbosity (buildFlags, buildExFlags) extraArgs g
configureAction verbosity distPref useSandbox noAddSource
(buildNumJobs buildFlags) mempty [] globalFlags config

nixShell verbosity distPref globalFlags config $ do
nixShell verbosity distPref globalFlags config $
maybeWithSandboxDirOnSearchPath useSandbox $ buildForCommand
commandUI verbosity config' distPref buildFlags extraArgs

Expand All @@ -502,12 +502,7 @@ buildForCommand :: CommandUI BuildFlags
-> [String]
-> IO ()
buildForCommand command verbosity config distPref buildFlags extraArgs =
setupWrapper verbosity
setupOptions
Nothing
command
mkBuildFlags
(const extraArgs)
setupWrapper verbosity setupOptions Nothing command mkBuildFlags (const extraArgs)
where
setupOptions = defaultSetupScriptOptions { useDistPref = distPref }

Expand Down Expand Up @@ -556,8 +551,8 @@ replAction (replFlags, buildExFlags) extraArgs globalFlags = do
-- be done to support sandboxes.
_ <-
reconfigure configureAction
verbosity distPref useSandbox noAddSource NoFlag
mempty [] globalFlags config
verbosity distPref useSandbox noAddSource NoFlag
mempty [] globalFlags config
let progDb = defaultProgramDb
setupOptions = defaultSetupScriptOptions
{ useCabalVersion = orLaterVersion $ mkVersion [1,18,0]
Expand Down

0 comments on commit 1559b76

Please sign in to comment.