diff options
Diffstat (limited to 'Utility')
| -rw-r--r-- | Utility/Conditional.hs | 26 | ||||
| -rw-r--r-- | Utility/CopyFile.hs | 2 | ||||
| -rw-r--r-- | Utility/Directory.hs | 2 |
3 files changed, 2 insertions, 28 deletions
diff --git a/Utility/Conditional.hs b/Utility/Conditional.hs deleted file mode 100644 index 85e39ec64..000000000 --- a/Utility/Conditional.hs +++ /dev/null @@ -1,26 +0,0 @@ -{- monadic conditional operators - - - - Copyright 2011 Joey Hess <joey@kitenet.net> - - - - Licensed under the GNU GPL version 3 or higher. - -} - -module Utility.Conditional where - -import Control.Monad (when, unless) - -whenM :: Monad m => m Bool -> m () -> m () -whenM c a = c >>= flip when a - -unlessM :: Monad m => m Bool -> m () -> m () -unlessM c a = c >>= flip unless a - -(>>?) :: Monad m => m Bool -> m () -> m () -(>>?) = whenM - -(>>!) :: Monad m => m Bool -> m () -> m () -(>>!) = unlessM - --- low fixity allows eg, foo bar >>! error $ "failed " ++ meep -infixr 0 >>? -infixr 0 >>! diff --git a/Utility/CopyFile.hs b/Utility/CopyFile.hs index 5d6855bf0..c42506485 100644 --- a/Utility/CopyFile.hs +++ b/Utility/CopyFile.hs @@ -8,8 +8,8 @@ module Utility.CopyFile (copyFileExternal) where import System.Directory (doesFileExist, removeFile) +import Control.Monad.IfElse -import Utility.Conditional import Utility.SafeCommand import qualified Build.SysConfig as SysConfig diff --git a/Utility/Directory.hs b/Utility/Directory.hs index 249ed6935..b5fedb9c7 100644 --- a/Utility/Directory.hs +++ b/Utility/Directory.hs @@ -12,9 +12,9 @@ import System.Posix.Files import System.Directory import Control.Exception (throw) import Control.Monad +import Control.Monad.IfElse import Utility.SafeCommand -import Utility.Conditional import Utility.TempFile {- Moves one filename to another. |