From f36a01d42d875480de464b2eaa82980d897edb5b Mon Sep 17 00:00:00 2001 From: Alexander Biehl Date: Mon, 12 Feb 2018 10:32:46 +0100 Subject: [PATCH] CmdHaddock: use fromFlagOrDefault --- cabal-install/Distribution/Client/CmdHaddock.hs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/cabal-install/Distribution/Client/CmdHaddock.hs b/cabal-install/Distribution/Client/CmdHaddock.hs index 4631198b2d9..e4573ec438d 100644 --- a/cabal-install/Distribution/Client/CmdHaddock.hs +++ b/cabal-install/Distribution/Client/CmdHaddock.hs @@ -20,7 +20,7 @@ import Distribution.Client.Setup ( GlobalFlags, ConfigFlags(..), ConfigExFlags, InstallFlags ) import qualified Distribution.Client.Setup as Client import Distribution.Simple.Setup - ( HaddockFlags(..), fromFlagOrDefault, fromFlag ) + ( HaddockFlags(..), fromFlagOrDefault ) import Distribution.Simple.Command ( CommandUI(..), usageAlternatives ) import Distribution.Verbosity @@ -151,10 +151,10 @@ selectPackageTargets haddockFlags targetSelector targets isRequested (TargetAllPackages (Just _)) _ = True isRequested _ LibKind = True -- isRequested _ SubLibKind = True --TODO: what about sublibs? - isRequested _ FLibKind = fromFlag (haddockForeignLibs haddockFlags) - isRequested _ ExeKind = fromFlag (haddockExecutables haddockFlags) - isRequested _ TestKind = fromFlag (haddockTestSuites haddockFlags) - isRequested _ BenchKind = fromFlag (haddockBenchmarks haddockFlags) + isRequested _ FLibKind = fromFlagOrDefault False (haddockForeignLibs haddockFlags) + isRequested _ ExeKind = fromFlagOrDefault False (haddockExecutables haddockFlags) + isRequested _ TestKind = fromFlagOrDefault False (haddockTestSuites haddockFlags) + isRequested _ BenchKind = fromFlagOrDefault False (haddockBenchmarks haddockFlags) -- | For a 'TargetComponent' 'TargetSelector', check if the component can be