rhi/filemanip
1
0
Fork 0
Code Issues Pull requests Releases Activity

Fix GHC 7.6 build problems

Browse source
This commit is contained in:
Bryan O'Sullivan 2012-08-29 20:12:51 -07:00
parent 5e1c7899ac
commit a0839097e9
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
System/FilePath/Find.hs
View file

@ -111,7 +111,8 @@ module System.FilePath.Find (
, (||?) , (||?)
) where ) 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 (foldM, forM, liftM, liftM2)
import Control.Monad.State (State, evalState, get) import Control.Monad.State (State, evalState, get)
import Data.Bits (Bits, (.&.)) import Data.Bits (Bits, (.&.))
@ -123,7 +124,6 @@ import System.IO (hPutStrLn, stderr)
import System.IO.Unsafe (unsafeInterleaveIO, unsafePerformIO) import System.IO.Unsafe (unsafeInterleaveIO, unsafePerformIO)
import qualified System.PosixCompat.Files as F import qualified System.PosixCompat.Files as F
import qualified System.PosixCompat.Types as T import qualified System.PosixCompat.Types as T
import Prelude hiding (catch)
-- | Information collected during the traversal of a directory. -- | Information collected during the traversal of a directory.
data FileInfo = FileInfo data FileInfo = FileInfo
@ -222,7 +222,7 @@ findWithHandler errHandler recurse filt path0 =
then unsafeInterleaveIO (traverse path (succ depth) st) then unsafeInterleaveIO (traverse path (succ depth) st)
else filterPath path depth st [] else filterPath path depth st []
traverse dir depth dirSt = do traverse dir depth dirSt = do
names <- catch (getDirContents dir) (errHandler dir) names <- E.catch (getDirContents dir) (errHandler dir)
filteredPaths <- forM names $ \name -> do filteredPaths <- forM names $ \name -> do
let path = dir </> name let path = dir </> name
unsafeInterleaveIO $ handle (errHandler path) unsafeInterleaveIO $ handle (errHandler path)