mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

simplify Show instance by deriving

Browse source
This commit is contained in:
Joey Hess 2019-01-09 13:13:31 -04:00
parent 11f4d993b5
commit de4980ef85
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
2 changed files with 2 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Annex/VectorClock.hs
View file

@ -24,7 +24,7 @@ import qualified Data.Attoparsec.ByteString.Lazy as A
-- | Some very old logs did not have any time stamp at all; -- | Some very old logs did not have any time stamp at all;
-- Unknown is used for those. -- Unknown is used for those.
data VectorClock = Unknown | VectorClock POSIXTime data VectorClock = Unknown | VectorClock POSIXTime
deriving (Eq, Ord) deriving (Eq, Ord, Show)
-- Unknown is oldest. -- Unknown is oldest.
prop_VectorClock_sane :: Bool prop_VectorClock_sane :: Bool

5
Logs/Presence/Pure.hs
View file

@ -26,10 +26,7 @@ data LogLine = LogLine
{ date :: VectorClock { date :: VectorClock
, status :: LogStatus , status :: LogStatus
, info :: LogInfo , info :: LogInfo
} deriving (Eq) } deriving (Eq, Show)
instance Show LogLine where
show l = "LogLine " ++ formatVectorClock (date l) ++ " " ++ show (status l) ++ " " ++ show (info l)
data LogStatus = InfoPresent | InfoMissing | InfoDead data LogStatus = InfoPresent | InfoMissing | InfoDead
deriving (Eq, Show, Bounded, Enum) deriving (Eq, Show, Bounded, Enum)