avoid the functor

fmap = liftM
2011-08-21 14:59:34 -04:00 · 2011-08-21 14:59:34 -04:00 · 4c73d77b42
commit 4c73d77b42
parent 06f509854a
2 changed files with 1 additions and 2 deletions
--- a/Annex.hs
+++ b/Annex.hs
@ -33,7 +33,6 @@ import Types.UUID
 -- git-annex's monad
 newtype Annex a = Annex { runAnnex :: StateT AnnexState IO a }
 	deriving (
-		Functor,
 		Monad,
 		MonadIO,
 		MonadControlIO,
--- a/Branch.hs
+++ b/Branch.hs
@ -321,7 +321,7 @@ getJournalFile file = do

 {- List of journal files. -}
 getJournalFiles :: Annex [FilePath]
-getJournalFiles = fmap (map fileJournal) getJournalFilesRaw
+getJournalFiles = liftM (map fileJournal) getJournalFilesRaw

 getJournalFilesRaw :: Annex [FilePath]
 getJournalFilesRaw = do