cadey
/
propellor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

can now derive Show for Attr

This commit is contained in:
Joey Hess 2014-06-05 17:07:02 -04:00
parent 4ac314fb48
commit 0f4e219838
1 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/Propellor/Types/Attr.hs
View File

@ -14,7 +14,7 @@ data Attr = Attr
, _namedconf :: Dns.NamedConfMap , _namedconf :: Dns.NamedConfMap
, _dockerattr :: DockerAttr , _dockerattr :: DockerAttr
} }
deriving (Eq) deriving (Eq, Show)
instance Monoid Attr where instance Monoid Attr where
mempty = Attr mempty mempty mempty mempty mempty mempty = Attr mempty mempty mempty mempty mempty
@ -26,15 +26,6 @@ instance Monoid Attr where
, _dockerattr = _dockerattr old <> _dockerattr new , _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 data Val a = Val a | NoVal
deriving (Eq, Show) deriving (Eq, Show)