From 0f4e219838a8101471715de94e98a1279f4879a6 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 5 Jun 2014 17:07:02 -0400 Subject: [PATCH] can now derive Show for Attr --- src/Propellor/Types/Attr.hs | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/src/Propellor/Types/Attr.hs b/src/Propellor/Types/Attr.hs index e8c22a9..4389a4e 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)