Skip to content

Commit e67b7b1

Browse files
hvrhvr
committed
Revert "Introduce applyFlagsDefault and use ViewPatterns"
See haskell#4737 This reverts commit 71131cf.
1 parent 92a321b commit e67b7b1

File tree

9 files changed

+25
-45
lines changed

9 files changed

+25
-45
lines changed

‎cabal-install/Distribution/Client/CmdBench.hs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
{-# LANGUAGE NamedFieldPuns #-}
2-
{-# LANGUAGE ViewPatterns #-}
32

43
-- | cabal-install CLI command: bench
54
--
@@ -18,8 +17,7 @@ import Distribution.Client.ProjectOrchestration
1817
import Distribution.Client.CmdErrorMessages
1918

2019
import Distribution.Client.Setup
21-
( GlobalFlags, ConfigFlags(..), ConfigExFlags, InstallFlags
22-
, applyFlagDefaults )
20+
( GlobalFlags, ConfigFlags(..), ConfigExFlags, InstallFlags )
2321
import qualified Distribution.Client.Setup as Client
2422
import Distribution.Simple.Setup
2523
( HaddockFlags, fromFlagOrDefault )
@@ -77,7 +75,7 @@ benchCommand = Client.installCommand {
7775
--
7876
benchAction :: (ConfigFlags, ConfigExFlags, InstallFlags, HaddockFlags)
7977
-> [String] -> GlobalFlags -> IO ()
80-
benchAction (applyFlagDefaults -> (configFlags, configExFlags, installFlags, haddockFlags))
78+
benchAction (configFlags, configExFlags, installFlags, haddockFlags)
8179
targetStrings globalFlags = do
8280

8381
baseCtx <- establishProjectBaseContext verbosity cliConfig

‎cabal-install/Distribution/Client/CmdBuild.hs

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
{-# LANGUAGE ViewPatterns #-}
2-
31
-- | cabal-install CLI command: build
42
--
53
module Distribution.Client.CmdBuild (
@@ -17,8 +15,7 @@ import Distribution.Client.ProjectOrchestration
1715
import Distribution.Client.CmdErrorMessages
1816

1917
import Distribution.Client.Setup
20-
( GlobalFlags, ConfigFlags(..), ConfigExFlags, InstallFlags
21-
, applyFlagDefaults )
18+
( GlobalFlags, ConfigFlags(..), ConfigExFlags, InstallFlags )
2219
import qualified Distribution.Client.Setup as Client
2320
import Distribution.Simple.Setup
2421
( HaddockFlags, fromFlagOrDefault )
@@ -75,7 +72,7 @@ buildCommand = Client.installCommand {
7572
--
7673
buildAction :: (ConfigFlags, ConfigExFlags, InstallFlags, HaddockFlags)
7774
-> [String] -> GlobalFlags -> IO ()
78-
buildAction (applyFlagDefaults -> (configFlags, configExFlags, installFlags, haddockFlags))
75+
buildAction (configFlags, configExFlags, installFlags, haddockFlags)
7976
targetStrings globalFlags = do
8077

8178
baseCtx <- establishProjectBaseContext verbosity cliConfig

‎cabal-install/Distribution/Client/CmdConfigure.hs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
{-# LANGUAGE ViewPatterns #-}
21
-- | cabal-install CLI command: configure
32
--
43
module Distribution.Client.CmdConfigure (
@@ -15,8 +14,7 @@ import Distribution.Client.ProjectConfig
1514
( writeProjectLocalExtraConfig )
1615

1716
import Distribution.Client.Setup
18-
( GlobalFlags, ConfigFlags(..), ConfigExFlags, InstallFlags
19-
, applyFlagDefaults )
17+
( GlobalFlags, ConfigFlags(..), ConfigExFlags, InstallFlags )
2018
import Distribution.Simple.Setup
2119
( HaddockFlags, fromFlagOrDefault )
2220
import Distribution.Verbosity
@@ -82,7 +80,7 @@ configureCommand = Client.installCommand {
8280
--
8381
configureAction :: (ConfigFlags, ConfigExFlags, InstallFlags, HaddockFlags)
8482
-> [String] -> GlobalFlags -> IO ()
85-
configureAction (applyFlagDefaults -> (configFlags, configExFlags, installFlags, haddockFlags))
83+
configureAction (configFlags, configExFlags, installFlags, haddockFlags)
8684
_extraArgs globalFlags = do
8785
--TODO: deal with _extraArgs, since flags with wrong syntax end up there
8886

‎cabal-install/Distribution/Client/CmdFreeze.hs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{-# LANGUAGE CPP, NamedFieldPuns, RecordWildCards, ViewPatterns #-}
1+
{-# LANGUAGE CPP, NamedFieldPuns, RecordWildCards #-}
22

33
-- | cabal-install CLI command: freeze
44
--
@@ -31,8 +31,7 @@ import Distribution.Version
3131
import Distribution.PackageDescription
3232
( FlagAssignment, nullFlagAssignment )
3333
import Distribution.Client.Setup
34-
( GlobalFlags, ConfigFlags(..), ConfigExFlags, InstallFlags
35-
, applyFlagDefaults )
34+
( GlobalFlags, ConfigFlags(..), ConfigExFlags, InstallFlags )
3635
import Distribution.Simple.Setup
3736
( HaddockFlags, fromFlagOrDefault )
3837
import Distribution.Simple.Utils
@@ -102,7 +101,7 @@ freezeCommand = Client.installCommand {
102101
--
103102
freezeAction :: (ConfigFlags, ConfigExFlags, InstallFlags, HaddockFlags)
104103
-> [String] -> GlobalFlags -> IO ()
105-
freezeAction (applyFlagDefaults -> (configFlags, configExFlags, installFlags, haddockFlags))
104+
freezeAction (configFlags, configExFlags, installFlags, haddockFlags)
106105
extraArgs globalFlags = do
107106

108107
unless (null extraArgs) $

‎cabal-install/Distribution/Client/CmdHaddock.hs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
{-# LANGUAGE NamedFieldPuns #-}
2-
{-# LANGUAGE ViewPatterns #-}
32

43
-- | cabal-install CLI command: haddock
54
--
@@ -18,8 +17,7 @@ import Distribution.Client.ProjectOrchestration
1817
import Distribution.Client.CmdErrorMessages
1918

2019
import Distribution.Client.Setup
21-
( GlobalFlags, ConfigFlags(..), ConfigExFlags, InstallFlags
22-
, applyFlagDefaults )
20+
( GlobalFlags, ConfigFlags(..), ConfigExFlags, InstallFlags )
2321
import qualified Distribution.Client.Setup as Client
2422
import Distribution.Simple.Setup
2523
( HaddockFlags(..), fromFlagOrDefault, fromFlag )
@@ -73,7 +71,7 @@ haddockCommand = Client.installCommand {
7371
--
7472
haddockAction :: (ConfigFlags, ConfigExFlags, InstallFlags, HaddockFlags)
7573
-> [String] -> GlobalFlags -> IO ()
76-
haddockAction (applyFlagDefaults -> (configFlags, configExFlags, installFlags, haddockFlags))
74+
haddockAction (configFlags, configExFlags, installFlags, haddockFlags)
7775
targetStrings globalFlags = do
7876

7977
baseCtx <- establishProjectBaseContext verbosity cliConfig

‎cabal-install/Distribution/Client/CmdRepl.hs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
{-# LANGUAGE NamedFieldPuns #-}
2-
{-# LANGUAGE ViewPatterns #-}
32

43
-- | cabal-install CLI command: repl
54
--
@@ -18,8 +17,7 @@ import Distribution.Client.ProjectOrchestration
1817
import Distribution.Client.CmdErrorMessages
1918

2019
import Distribution.Client.Setup
21-
( GlobalFlags, ConfigFlags(..), ConfigExFlags, InstallFlags
22-
, applyFlagDefaults )
20+
( GlobalFlags, ConfigFlags(..), ConfigExFlags, InstallFlags )
2321
import qualified Distribution.Client.Setup as Client
2422
import Distribution.Simple.Setup
2523
( HaddockFlags, fromFlagOrDefault )
@@ -89,7 +87,7 @@ replCommand = Client.installCommand {
8987
--
9088
replAction :: (ConfigFlags, ConfigExFlags, InstallFlags, HaddockFlags)
9189
-> [String] -> GlobalFlags -> IO ()
92-
replAction (applyFlagDefaults -> (configFlags, configExFlags, installFlags, haddockFlags))
90+
replAction (configFlags, configExFlags, installFlags, haddockFlags)
9391
targetStrings globalFlags = do
9492

9593
baseCtx <- establishProjectBaseContext verbosity cliConfig

‎cabal-install/Distribution/Client/CmdRun.hs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
{-# LANGUAGE NamedFieldPuns #-}
2-
{-# LANGUAGE ViewPatterns #-}
32

43
-- | cabal-install CLI command: run
54
--
@@ -21,8 +20,7 @@ import Distribution.Client.ProjectOrchestration
2120
import Distribution.Client.CmdErrorMessages
2221

2322
import Distribution.Client.Setup
24-
( GlobalFlags, ConfigFlags(..), ConfigExFlags, InstallFlags
25-
, applyFlagDefaults )
23+
( GlobalFlags, ConfigFlags(..), ConfigExFlags, InstallFlags )
2624
import qualified Distribution.Client.Setup as Client
2725
import Distribution.Simple.Setup
2826
( HaddockFlags, fromFlagOrDefault )
@@ -108,7 +106,7 @@ runCommand = Client.installCommand {
108106
--
109107
runAction :: (ConfigFlags, ConfigExFlags, InstallFlags, HaddockFlags)
110108
-> [String] -> GlobalFlags -> IO ()
111-
runAction (applyFlagDefaults -> (configFlags, configExFlags, installFlags, haddockFlags))
109+
runAction (configFlags, configExFlags, installFlags, haddockFlags)
112110
targetStrings globalFlags = do
113111

114112
baseCtx <- establishProjectBaseContext verbosity cliConfig

‎cabal-install/Distribution/Client/CmdTest.hs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
{-# LANGUAGE NamedFieldPuns #-}
2-
{-# LANGUAGE ViewPatterns #-}
32

43
-- | cabal-install CLI command: test
54
--
@@ -18,8 +17,7 @@ import Distribution.Client.ProjectOrchestration
1817
import Distribution.Client.CmdErrorMessages
1918

2019
import Distribution.Client.Setup
21-
( GlobalFlags, ConfigFlags(..), ConfigExFlags, InstallFlags
22-
, applyFlagDefaults )
20+
( GlobalFlags, ConfigFlags(..), ConfigExFlags, InstallFlags )
2321
import qualified Distribution.Client.Setup as Client
2422
import Distribution.Simple.Setup
2523
( HaddockFlags, fromFlagOrDefault )
@@ -80,7 +78,7 @@ testCommand = Client.installCommand {
8078
--
8179
testAction :: (ConfigFlags, ConfigExFlags, InstallFlags, HaddockFlags)
8280
-> [String] -> GlobalFlags -> IO ()
83-
testAction (applyFlagDefaults -> (configFlags, configExFlags, installFlags, haddockFlags))
81+
testAction (configFlags, configExFlags, installFlags, haddockFlags)
8482
targetStrings globalFlags = do
8583

8684
baseCtx <- establishProjectBaseContext verbosity cliConfig

‎cabal-install/Distribution/Client/Setup.hs

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ module Distribution.Client.Setup
4949
, userConfigCommand, UserConfigFlags(..)
5050
, manpageCommand
5151

52-
, applyFlagDefaults
5352
, parsePackageArgs
5453
--TODO: stop exporting these:
5554
, showRepo
@@ -131,15 +130,6 @@ import System.FilePath
131130
import Network.URI
132131
( parseAbsoluteURI, uriToString )
133132

134-
applyFlagDefaults :: (ConfigFlags, ConfigExFlags, InstallFlags, HaddockFlags)
135-
-> (ConfigFlags, ConfigExFlags, InstallFlags, HaddockFlags)
136-
applyFlagDefaults (configFlags, configExFlags, installFlags, haddockFlags) =
137-
( commandDefaultFlags configureCommand <> configFlags
138-
, defaultConfigExFlags <> configExFlags
139-
, defaultInstallFlags <> installFlags
140-
, Cabal.defaultHaddockFlags <> haddockFlags
141-
)
142-
143133
globalCommand :: [Command action] -> CommandUI GlobalFlags
144134
globalCommand commands = CommandUI {
145135
commandName = "",
@@ -1103,7 +1093,10 @@ upgradeCommand = configureCommand {
11031093
commandSynopsis = "(command disabled, use install instead)",
11041094
commandDescription = Nothing,
11051095
commandUsage = usageFlagsOrPackages "upgrade",
1106-
commandDefaultFlags = (mempty, mempty, mempty, mempty),
1096+
commandDefaultFlags = (commandDefaultFlags configureCommand,
1097+
defaultConfigExFlags,
1098+
defaultInstallFlags,
1099+
Cabal.defaultHaddockFlags),
11071100
commandOptions = commandOptions installCommand
11081101
}
11091102

@@ -1610,7 +1603,10 @@ installCommand = CommandUI {
16101603
++ " " ++ (map (const ' ') pname)
16111604
++ " "
16121605
++ " Change installation destination\n",
1613-
commandDefaultFlags = (mempty, mempty, mempty, mempty),
1606+
commandDefaultFlags = (commandDefaultFlags configureCommand,
1607+
defaultConfigExFlags,
1608+
defaultInstallFlags,
1609+
Cabal.defaultHaddockFlags),
16141610
commandOptions = \showOrParseArgs ->
16151611
liftOptions get1 set1
16161612
(filter ((`notElem` ["constraint", "dependency"

0 commit comments

Comments
 (0)