diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-06-02 15:01:58 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-06-02 15:01:58 -0400 |
| commit | 16ca22c60af39cc06db62215a1ac12cd5ae7a3c5 (patch) | |
| tree | cf3f0c6ea6297087cab68ca8317e85b64f57406c /Utility | |
| parent | 13aeb89e2a1a44c9404fef93cb3dcdced618285f (diff) | |
avoid warnings when built with ghc 7.6
Diffstat (limited to 'Utility')
| -rw-r--r-- | Utility/Exception.hs | 4 | ||||
| -rw-r--r-- | Utility/Mounts.hsc | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/Utility/Exception.hs b/Utility/Exception.hs index bc928e18e..3835d741d 100644 --- a/Utility/Exception.hs +++ b/Utility/Exception.hs @@ -9,8 +9,8 @@ module Utility.Exception where -import Prelude hiding (catch) import Control.Exception +import qualified Control.Exception as E import Control.Applicative import Control.Monad import System.IO.Error (isDoesNotExistError) @@ -33,7 +33,7 @@ catchMsgIO a = either (Left . show) Right <$> tryIO a {- catch specialized for IO errors only -} catchIO :: IO a -> (IOException -> IO a) -> IO a -catchIO = catch +catchIO = E.catch {- try specialized for IO errors only -} tryIO :: IO a -> IO (Either IOException a) diff --git a/Utility/Mounts.hsc b/Utility/Mounts.hsc index c13b0ece1..b6defda43 100644 --- a/Utility/Mounts.hsc +++ b/Utility/Mounts.hsc @@ -20,8 +20,6 @@ module Utility.Mounts ( import Control.Monad import Foreign import Foreign.C -import GHC.IO hiding (finally, bracket) -import Prelude hiding (catch) #include "libmounts.h" #else import Utility.Exception |