From b7071dee84a5a24d62bf64b2bbe184b38e670431 Mon Sep 17 00:00:00 2001
From: Simon Michael <simon@joyful.com>
Date: Fri, 29 Jul 2016 10:15:48 -0700
Subject: [PATCH] lib: use Data.Default directly, not via cmdargs

---
 hledger-lib/Hledger/Data/Types.hs            | 1 +
 hledger-lib/Hledger/Reports/ReportOptions.hs | 3 ++-
 hledger-lib/future-package.yaml              | 1 +
 hledger-lib/hledger-lib.cabal                | 2 ++
 hledger-ui/Hledger/UI/UIOptions.hs           | 3 +--
 hledger-web/Hledger/Web/WebOptions.hs        | 3 +--
 hledger/Hledger/Cli/CliOptions.hs            | 3 ++-
 hledger/future-package.yaml                  | 1 +
 hledger/hledger.cabal                        | 3 +++
 9 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/hledger-lib/Hledger/Data/Types.hs b/hledger-lib/Hledger/Data/Types.hs
index 2e74b96ad..c504cbe55 100644
--- a/hledger-lib/Hledger/Data/Types.hs
+++ b/hledger-lib/Hledger/Data/Types.hs
@@ -25,6 +25,7 @@ import Control.DeepSeq (NFData)
 import Control.Monad.Except (ExceptT)
 import Data.Data
 import Data.Decimal
+import Data.Default
 import Text.Blaze (ToMarkup(..))
 import qualified Data.Map as M
 import Data.Text (Text)
diff --git a/hledger-lib/Hledger/Reports/ReportOptions.hs b/hledger-lib/Hledger/Reports/ReportOptions.hs
index fc08897e3..e5e1a4854 100644
--- a/hledger-lib/Hledger/Reports/ReportOptions.hs
+++ b/hledger-lib/Hledger/Reports/ReportOptions.hs
@@ -37,7 +37,7 @@ import Data.Functor.Compat ((<$>))
 import qualified Data.Text as T
 import Data.Typeable (Typeable)
 import Data.Time.Calendar
-import System.Console.CmdArgs.Default  -- some additional default stuff
+import Data.Default
 import Test.HUnit
 
 import Hledger.Data
@@ -97,6 +97,7 @@ data ReportOpts = ReportOpts {
  } deriving (Show, Data, Typeable)
 
 instance Default ReportOpts where def = defreportopts
+instance Default Bool where def = False
 
 defreportopts :: ReportOpts
 defreportopts = ReportOpts
diff --git a/hledger-lib/future-package.yaml b/hledger-lib/future-package.yaml
index 8be73815d..77b63caf0 100644
--- a/hledger-lib/future-package.yaml
+++ b/hledger-lib/future-package.yaml
@@ -70,6 +70,7 @@ dependencies:
   - cmdargs >= 0.10 && < 0.11
   - containers
   - csv
+  - data-default >= 0.5
   - Decimal
   - deepseq
   - directory
diff --git a/hledger-lib/hledger-lib.cabal b/hledger-lib/hledger-lib.cabal
index fa23bb00d..29243b233 100644
--- a/hledger-lib/hledger-lib.cabal
+++ b/hledger-lib/hledger-lib.cabal
@@ -71,6 +71,7 @@ library
     , cmdargs >= 0.10 && < 0.11
     , containers
     , csv
+    , data-default >= 0.5
     , Decimal
     , deepseq
     , directory
@@ -154,6 +155,7 @@ test-suite hunittests
     , cmdargs >= 0.10 && < 0.11
     , containers
     , csv
+    , data-default >= 0.5
     , Decimal
     , deepseq
     , directory
diff --git a/hledger-ui/Hledger/UI/UIOptions.hs b/hledger-ui/Hledger/UI/UIOptions.hs
index a3758863d..dc093cc4f 100644
--- a/hledger-ui/Hledger/UI/UIOptions.hs
+++ b/hledger-ui/Hledger/UI/UIOptions.hs
@@ -5,12 +5,11 @@
 
 module Hledger.UI.UIOptions
 where
+import Data.Default
 #if !MIN_VERSION_base(4,8,0)
 import Data.Functor.Compat ((<$>))
 #endif
 import Data.List (intercalate)
-import System.Console.CmdArgs
-import System.Console.CmdArgs.Explicit
 
 import Hledger.Cli hiding (progname,version,prognameandversion)
 import Hledger.UI.Theme (themeNames)
diff --git a/hledger-web/Hledger/Web/WebOptions.hs b/hledger-web/Hledger/Web/WebOptions.hs
index 155c92587..be71439d7 100644
--- a/hledger-web/Hledger/Web/WebOptions.hs
+++ b/hledger-web/Hledger/Web/WebOptions.hs
@@ -2,12 +2,11 @@
 module Hledger.Web.WebOptions
 where
 import Prelude
+import Data.Default
 #if !MIN_VERSION_base(4,8,0)
 import Data.Functor.Compat ((<$>))
 #endif
 import Data.Maybe
-import System.Console.CmdArgs
-import System.Console.CmdArgs.Explicit
 
 import Hledger.Cli hiding (progname,version,prognameandversion)
 import Settings
diff --git a/hledger/Hledger/Cli/CliOptions.hs b/hledger/Hledger/Cli/CliOptions.hs
index f664e7008..d7a89dfc6 100644
--- a/hledger/Hledger/Cli/CliOptions.hs
+++ b/hledger/Hledger/Cli/CliOptions.hs
@@ -66,6 +66,7 @@ import Prelude ()
 import Prelude.Compat
 import qualified Control.Exception as C
 import Control.Monad (when)
+import Data.Default
 #if !MIN_VERSION_base(4,8,0)
 import Data.Functor.Compat ((<$>))
 #endif
@@ -76,7 +77,7 @@ import Data.Maybe
 -- import Data.Text (Text)
 import qualified Data.Text as T
 import Safe
-import System.Console.CmdArgs
+import System.Console.CmdArgs hiding (Default,def)
 import System.Console.CmdArgs.Explicit
 import System.Console.CmdArgs.Text
 #ifndef mingw32_HOST_OS
diff --git a/hledger/future-package.yaml b/hledger/future-package.yaml
index 7cecdb43c..0495b83c1 100644
--- a/hledger/future-package.yaml
+++ b/hledger/future-package.yaml
@@ -73,6 +73,7 @@ dependencies:
   - unordered-containers
   - cmdargs >= 0.10 && < 0.11
   - csv
+  - data-default >= 0.5
   - directory
   - file-embed >= 0.0.10 && < 0.1
   - filepath
diff --git a/hledger/hledger.cabal b/hledger/hledger.cabal
index 6512a5a99..c21dff96b 100644
--- a/hledger/hledger.cabal
+++ b/hledger/hledger.cabal
@@ -92,6 +92,7 @@ library
     , unordered-containers
     , cmdargs >= 0.10 && < 0.11
     , csv
+    , data-default >= 0.5
     , directory
     , file-embed >= 0.0.10 && < 0.1
     , filepath
@@ -174,6 +175,7 @@ executable hledger
     , unordered-containers
     , cmdargs >= 0.10 && < 0.11
     , csv
+    , data-default >= 0.5
     , directory
     , file-embed >= 0.0.10 && < 0.1
     , filepath
@@ -230,6 +232,7 @@ test-suite test
     , unordered-containers
     , cmdargs >= 0.10 && < 0.11
     , csv
+    , data-default >= 0.5
     , directory
     , file-embed >= 0.0.10 && < 0.1
     , filepath