From 29335bf32685ee665f9ec5acbcfe7f8edabd1b96 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Fri, 29 Jun 2012 10:00:05 -0400
Subject: pointlessness

---
 Annex.hs               |  2 +-
 Common.hs              |  1 +
 Logs/Presence.hs       |  2 +-
 Remote/Directory.hs    |  2 +-
 Utility/Applicative.hs | 16 ++++++++++++++++
 5 files changed, 20 insertions(+), 3 deletions(-)
 create mode 100644 Utility/Applicative.hs

diff --git a/Annex.hs b/Annex.hs
index 38168334d..32edeff5c 100644
--- a/Annex.hs
+++ b/Annex.hs
@@ -128,7 +128,7 @@ newState gitrepo = AnnexState
 {- Makes an Annex state object for the specified git repo.
  - Ensures the config is read, if it was not already. -}
 new :: Git.Repo -> IO AnnexState
-new gitrepo = newState <$> Git.Config.read gitrepo
+new = newState <$$> Git.Config.read
 
 {- performs an action in the Annex monad -}
 run :: AnnexState -> Annex a -> IO (a, AnnexState)
diff --git a/Common.hs b/Common.hs
index 347502460..7f07781ce 100644
--- a/Common.hs
+++ b/Common.hs
@@ -26,6 +26,7 @@ import Utility.SafeCommand as X
 import Utility.Path as X
 import Utility.Directory as X
 import Utility.Monad as X
+import Utility.Applicative as X
 import Utility.FileSystemEncoding as X
 
 import Utility.PartialPrelude as X
diff --git a/Logs/Presence.hs b/Logs/Presence.hs
index 933426718..e75e1e4e6 100644
--- a/Logs/Presence.hs
+++ b/Logs/Presence.hs
@@ -48,7 +48,7 @@ addLog file line = Annex.Branch.change file $ \s ->
 {- Reads a log file.
  - Note that the LogLines returned may be in any order. -}
 readLog :: FilePath -> Annex [LogLine]
-readLog file = parseLog <$> Annex.Branch.get file
+readLog = parseLog <$$> Annex.Branch.get
 
 {- Parses a log file. Unparseable lines are ignored. -}
 parseLog :: String -> [LogLine]
diff --git a/Remote/Directory.hs b/Remote/Directory.hs
index a5b0ff2a2..f618f518e 100644
--- a/Remote/Directory.hs
+++ b/Remote/Directory.hs
@@ -272,7 +272,7 @@ retrieveCheap d _ k f = liftIO $ withStoredFiles Nothing d k go
 remove :: FilePath -> ChunkSize -> Key -> Annex Bool
 remove d chunksize k = liftIO $ withStoredFiles chunksize d k go
 	where
-		go files = all id <$> mapM removefile files
+		go = all id <$$> mapM removefile
 		removefile file = catchBoolIO $ do
 			let dir = parentDir file
 			allowWrite dir
diff --git a/Utility/Applicative.hs b/Utility/Applicative.hs
new file mode 100644
index 000000000..64400c801
--- /dev/null
+++ b/Utility/Applicative.hs
@@ -0,0 +1,16 @@
+{- applicative stuff
+ -
+ - Copyright 2012 Joey Hess <joey@kitenet.net>
+ -
+ - Licensed under the GNU GPL version 3 or higher.
+ -}
+
+module Utility.Applicative where
+
+{- Like <$> , but supports one level of currying.
+ - 
+ - foo v = bar <$> action v  ==  foo = bar <$$> action
+ -}
+(<$$>) :: Functor f => (a -> b) -> (c -> f a) -> c -> f b
+f <$$> v = fmap f . v
+infixr 4 <$$>
-- 
cgit v1.2.3