From ea855a5fdc3abe2cf5b557be9449596d59dc2901 Mon Sep 17 00:00:00 2001 From: Ian Lynagh Date: Sat, 18 Aug 2007 19:44:36 +0000 Subject: [PATCH] Use the qualified name for catch Unqualified it's ambiguous with some configurations. --- compiler/main/GHC.hs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/compiler/main/GHC.hs b/compiler/main/GHC.hs index bf276d5..dcfd02a 100644 --- a/compiler/main/GHC.hs +++ b/compiler/main/GHC.hs @@ -273,7 +273,7 @@ import Control.Exception as Exception hiding (handle) import Data.IORef import System.IO import System.IO.Error ( try, isDoesNotExistError ) -import Prelude hiding (init, catch) +import Prelude hiding (init) -- ----------------------------------------------------------------------------- @@ -542,7 +542,7 @@ load s@(Session ref) how_much case mb_graph of Just mod_graph -> catchingFailure $ load2 s how_much mod_graph Nothing -> return Failed - where catchingFailure f = f `catch` \e -> do + where catchingFailure f = f `Exception.catch` \e -> do hsc_env <- readIORef ref -- trac #1565 / test ghci021: -- let bindings may explode if we try to use them after -- 1.7.10.4