summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2015-04-03 19:56:56 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2015-04-03 19:56:56 -0400
commit422258a5ea23b885e31702f98f16923d205a20de (patch)
treec066f01ae895cf1d702ec1cfa9897ce4931a2a0b
parentc4218e0ffed77e2afaafc8efd19efd907a6abd8a (diff)
use def
-rw-r--r--Annex.hs2
-rw-r--r--Types/Messages.hs7
2 files changed, 6 insertions, 3 deletions
diff --git a/Annex.hs b/Annex.hs
index 0ebdd4c07..1c8618cc0 100644
--- a/Annex.hs
+++ b/Annex.hs
@@ -142,7 +142,7 @@ newState c r = AnnexState
, backends = []
, remotes = []
, remoteannexstate = M.empty
- , output = defaultMessageState
+ , output = def
, force = False
, fast = False
, daemon = False
diff --git a/Types/Messages.hs b/Types/Messages.hs
index 35bb19057..a437d86ef 100644
--- a/Types/Messages.hs
+++ b/Types/Messages.hs
@@ -7,6 +7,8 @@
module Types.Messages where
+import Data.Default
+
data OutputType = NormalOutput | QuietOutput | ProgressOutput | JSONOutput
data SideActionBlock = NoBlock | StartBlock | InBlock
@@ -17,5 +19,6 @@ data MessageState = MessageState
, sideActionBlock :: SideActionBlock
}
-defaultMessageState :: MessageState
-defaultMessageState = MessageState NormalOutput NoBlock
+instance Default MessageState
+ where
+ def = MessageState NormalOutput NoBlock