X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fmain%2FGHC.hs;h=6cdce86759c0a7d059dea6a848c2df61b4fc7c17;hb=81d7d5586e88caa9798d4c401bd28acc73e4e6e1;hp=e1bc5de643614663b6c593e6f8306ccd1d232c25;hpb=94bf0d3604ff0d2ecab246924af712bdd1c29a40;p=ghc-hetmet.git

diff --git a/compiler/main/GHC.hs b/compiler/main/GHC.hs
index e1bc5de..6cdce86 100644
--- a/compiler/main/GHC.hs
+++ b/compiler/main/GHC.hs
@@ -96,7 +96,7 @@ module GHC (
         resume,
         Resume(resumeStmt, resumeThreadId, resumeBreakInfo, resumeSpan,
                resumeHistory, resumeHistoryIx),
-        History(historyBreakInfo, historyEnclosingDecl), 
+        History(historyBreakInfo, historyEnclosingDecls), 
         GHC.getHistorySpan, getHistoryModule,
         getResumeContext,
         abandon, abandonAll,
@@ -242,8 +242,10 @@ import BreakArray
 import InteractiveEval
 #endif
 
+import HscMain
+import DriverPipeline
 import GhcMonad
-import TcIface
+import TcIface          ( typecheckIface )
 import TcRnTypes
 import TcRnMonad        ( initIfaceCheck )
 import Packages
@@ -267,11 +269,9 @@ import InstEnv
 import SrcLoc
 import CoreSyn          ( CoreBind )
 import TidyPgm
-import DriverPipeline
-import DriverPhases	( Phase(..), isHaskellSrcFilename, startPhase )
+import DriverPhases     ( Phase(..), isHaskellSrcFilename, startPhase )
 import HeaderInfo
 import Finder
-import HscMain
 import HscTypes
 import DynFlags
 import StaticFlagParser
@@ -312,7 +312,7 @@ import Exception
 import Data.IORef
 import System.FilePath
 import System.IO
-import System.IO.Error	( try, isDoesNotExistError )
+import System.IO.Error	( isDoesNotExistError )
 import Prelude hiding (init)
 
 
@@ -2067,7 +2067,7 @@ summariseModule hsc_env old_summary_map is_boot (L loc wanted_mod)
 	case maybe_buf of
 	   Just (_,t) -> check_timestamp old_summary location src_fn t
 	   Nothing    -> do
-		m <- System.IO.Error.try (getModificationTime src_fn)
+		m <- tryIO (getModificationTime src_fn)
 		case m of
 		   Right t -> check_timestamp old_summary location src_fn t
 		   Left e | isDoesNotExistError e -> find_it