X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fmain%2FGHC.hs;h=cb433c3528a9a84248969e7844ed38916c96d8c9;hb=157964f0700f510c75bc10f3ebfc5cfce95b8227;hp=e1bc5de643614663b6c593e6f8306ccd1d232c25;hpb=94bf0d3604ff0d2ecab246924af712bdd1c29a40;p=ghc-hetmet.git diff --git a/compiler/main/GHC.hs b/compiler/main/GHC.hs index e1bc5de..cb433c3 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, @@ -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