From d7cd17287a93e9e7f2360b4cbc96b4e4057343a0 Mon Sep 17 00:00:00 2001 From: Bryan O'Sullivan Date: Wed, 29 Aug 2012 20:12:51 -0700 Subject: [PATCH] Fix GHC 7.6 build problems --- System/FilePath/Find.hs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/System/FilePath/Find.hs b/System/FilePath/Find.hs index 0f7244d..2af3bd6 100644 --- a/System/FilePath/Find.hs +++ b/System/FilePath/Find.hs @@ -111,7 +111,8 @@ module System.FilePath.Find ( , (||?) ) where -import Control.Exception +import qualified Control.Exception as E +import Control.Exception (IOException, handle) import Control.Monad (foldM, forM, liftM, liftM2) import Control.Monad.State (State, evalState, get) import Data.Bits (Bits, (.&.)) @@ -123,7 +124,6 @@ import System.IO (hPutStrLn, stderr) import System.IO.Unsafe (unsafeInterleaveIO, unsafePerformIO) import qualified System.PosixCompat.Files as F import qualified System.PosixCompat.Types as T -import Prelude hiding (catch) -- | Information collected during the traversal of a directory. data FileInfo = FileInfo @@ -222,7 +222,7 @@ findWithHandler errHandler recurse filt path0 = then unsafeInterleaveIO (traverse path (succ depth) st) else filterPath path depth st [] traverse dir depth dirSt = do - names <- catch (getDirContents dir) (errHandler dir) + names <- E.catch (getDirContents dir) (errHandler dir) filteredPaths <- forM names $ \name -> do let path = dir name unsafeInterleaveIO $ handle (errHandler path)