X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2Futils%2FUtil.lhs;h=01a293dcbd3b3762cc0fda037aa3a5e8f3e76d0c;hp=55a1a4f566e6a13c9c27939fa50c5744a215ed3b;hb=b00e3a6c0a82a8af3238d677f798d812cd7fd49f;hpb=50769d7532f90b0ec1f1759a56d478cf2926a0ff diff --git a/compiler/utils/Util.lhs b/compiler/utils/Util.lhs index 55a1a4f5..01a293d 100644 --- a/compiler/utils/Util.lhs +++ b/compiler/utils/Util.lhs @@ -86,6 +86,7 @@ module Util ( #include "HsVersions.h" +import Exception import Panic import Data.Data @@ -99,7 +100,7 @@ import FastTypes #endif import Control.Monad ( unless ) -import System.IO.Error as IO ( catch, isDoesNotExistError ) +import System.IO.Error as IO ( isDoesNotExistError ) import System.Directory ( doesDirectoryExist, createDirectory, getModificationTime ) import System.FilePath @@ -939,9 +940,9 @@ doesDirNameExist fpath = case takeDirectory fpath of modificationTimeIfExists :: FilePath -> IO (Maybe ClockTime) modificationTimeIfExists f = do (do t <- getModificationTime f; return (Just t)) - `IO.catch` \e -> if isDoesNotExistError e - then return Nothing - else ioError e + `catchIO` \e -> if isDoesNotExistError e + then return Nothing + else ioError e -- split a string at the last character where 'pred' is True, -- returning a pair of strings. The first component holds the string