summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJoey Hess2014-06-05 17:07:02 -0400
committerJoey Hess2014-06-05 17:07:02 -0400
commit0f4e219838a8101471715de94e98a1279f4879a6 (patch)
tree729db83b692ccff690fb33181af2fbcdd18e744a /src
parent4ac314fb4812ccdb62e930fe53e312ced6171e12 (diff)
can now derive Show for Attr
Diffstat (limited to 'src')
-rw-r--r--src/Propellor/Types/Attr.hs11
1 files changed, 1 insertions, 10 deletions
diff --git a/src/Propellor/Types/Attr.hs b/src/Propellor/Types/Attr.hs
index e8c22a94..4389a4e5 100644
--- a/src/Propellor/Types/Attr.hs
+++ b/src/Propellor/Types/Attr.hs
@@ -14,7 +14,7 @@ data Attr = Attr
, _namedconf :: Dns.NamedConfMap
, _dockerattr :: DockerAttr
}
- deriving (Eq)
+ deriving (Eq, Show)
instance Monoid Attr where
mempty = Attr mempty mempty mempty mempty mempty
@@ -26,15 +26,6 @@ instance Monoid Attr where
, _dockerattr = _dockerattr old <> _dockerattr new
}
-instance Show Attr where
- show a = unlines
- [ "OS " ++ show (_os a)
- , "sshPubKey " ++ show (_sshPubKey a)
- , "dns " ++ show (_dns a)
- , "namedconf " ++ show (_namedconf a)
- , show (_dockerattr a)
- ]
-
data Val a = Val a | NoVal
deriving (Eq, Show)