diff options
Diffstat (limited to 'Utility')
| -rw-r--r-- | Utility/Gpg.hs | 2 | ||||
| -rw-r--r-- | Utility/Monad.hs | 10 |
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 |