summaryrefslogtreecommitdiff
path: root/Utility
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2013-09-27 19:58:48 -0400
committerGravatar Joey Hess <joey@kitenet.net>2013-09-27 19:58:48 -0400
commit34bdb1436c716431c2fae58908e440fc506878b2 (patch)
treee46d5c1a0392cc008755bcd28455cd1494e6490a /Utility
parentcbf810a421901e76ee2d3e18592fb4d39de851a6 (diff)
remove *>=> and >=*> ; use <$$> instead
I forgot I had <$$> hidden away in Utility.Applicative. It allows doing the same kind of currying as does >=*> and I found using it made the code more readable for me. (*>=> was not used)
Diffstat (limited to 'Utility')
-rw-r--r--Utility/Gpg.hs2
-rw-r--r--Utility/Monad.hs10
2 files changed, 1 insertions, 11 deletions
diff --git a/Utility/Gpg.hs b/Utility/Gpg.hs
index f9b3d55e8..a2baa74dc 100644
--- a/Utility/Gpg.hs
+++ b/Utility/Gpg.hs
@@ -369,7 +369,7 @@ checkGpgPackets keys str = do
(Just (KeyIds ks), ls, []) -> do
-- Find the master key associated with the
-- encryption subkey.
- ks' <- concat <$> mapM (findPubKeys >=*> keyIds)
+ ks' <- concat <$> mapM (keyIds <$$> findPubKeys)
[ k | k:"keyid":_ <- map (reverse . words) ls ]
return $ sort (nub ks) == sort (nub ks')
_ -> return False
diff --git a/Utility/Monad.hs b/Utility/Monad.hs
index 4f5a6d244..1ba43c5f8 100644
--- a/Utility/Monad.hs
+++ b/Utility/Monad.hs
@@ -53,16 +53,6 @@ ma <&&> mb = ifM ma ( mb , return False )
infixr 3 <&&>
infixr 2 <||>
-{- Left-to-right Kleisli composition with a pure left/right hand side. -}
-(*>=>) :: Monad m => (a -> b) -> (b -> m c) -> (a -> m c)
-f *>=> g = return . f >=> g
-
-(>=*>) :: Monad m => (a -> m b) -> (b -> c) -> (a -> m c)
-f >=*> g = f >=> return . g
-
-{- Same fixity as >=> and <=< -}
-infixr 1 *>=>, >=*>
-
{- Runs an action, passing its value to an observer before returning it. -}
observe :: Monad m => (a -> m b) -> m a -> m a
observe observer a = do