X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;ds=sidebyside;f=ghc%2Fcompiler%2Frename%2FRnHiFiles.lhs;h=25706e3f2a28f508e3fdc0619a4a4dd6f4c0c80e;hb=32c62212b35b2b631f3753d432b508de5c79c783;hp=931c5cf59e25f86efcfd7a15306801cd57b5608f;hpb=9af77fa423926fbda946b31e174173d0ec5ebac8;p=ghc-hetmet.git

diff --git a/ghc/compiler/rename/RnHiFiles.lhs b/ghc/compiler/rename/RnHiFiles.lhs
index 931c5cf..25706e3 100644
--- a/ghc/compiler/rename/RnHiFiles.lhs
+++ b/ghc/compiler/rename/RnHiFiles.lhs
@@ -39,7 +39,7 @@ import RnEnv
 import TcRnMonad
 
 import PrelNames	( gHC_PRIM_Name, gHC_PRIM )
-import PrelInfo		( ghcPrimExports, cCallableClassDecl, cReturnableClassDecl, assertDecl )
+import PrelInfo		( ghcPrimExports, cCallableClassDecl, cReturnableClassDecl )
 import Name		( Name {-instance NamedThing-}, 
 			  nameModule, isInternalName )
 import NameEnv
@@ -688,12 +688,12 @@ findHiFile mod_name hi_boot_file
 @readIface@ tries just the one file.
 
 \begin{code}
-readIface :: Module -> String -> IsBootInterface -> TcRn m (Either IOError ParsedIface)
+readIface :: Module -> String -> IsBootInterface -> TcRn m (Either Exception ParsedIface)
 	-- Nothing <=> file not found, or unreadable, or illegible
 	-- Just x  <=> successfully found and parsed 
 
 readIface mod file_path is_hi_boot_file
-  = ioToTcRn_no_fail (read_iface mod file_path is_hi_boot_file)
+  = ioToTcRn (tryMost (read_iface mod file_path is_hi_boot_file))
 
 read_iface mod file_path is_hi_boot_file
  | is_hi_boot_file		-- Read ascii
@@ -740,8 +740,7 @@ ghcPrimIface = ParsedIface {
       pi_usages  = [],
       pi_exports = (1, [(gHC_PRIM_Name, ghcPrimExports)]),
       pi_decls   = [(1,cCallableClassDecl), 
-		    (1,cReturnableClassDecl), 
-		    (1,assertDecl)],
+		    (1,cReturnableClassDecl)],
       pi_fixity  = [FixitySig (nameRdrName (idName seqId)) 
 			      (Fixity 0 InfixR) noSrcLoc],
 		-- seq is infixr 0