[project @ 2001-11-23 11:47:12 by simonmar]

[ghc-hetmet.git] / ghc / compiler / rename / RnHiFiles.lhs

diff --git a/ghc/compiler/rename/RnHiFiles.lhs b/ghc/compiler/rename/RnHiFiles.lhs
index 86d02aa..dd4baca 100644 (file)
--- a/ghc/compiler/rename/RnHiFiles.lhs
+++ b/ghc/compiler/rename/RnHiFiles.lhs
@@ -429,7 +429,7 @@ loadRules mod (rule_bag, n_slurped) (version, rules)
 loadRule :: Module -> RdrNameRuleDecl -> RnM d (GatedDecl RdrNameRuleDecl)
 -- "Gate" the rule simply by whether the rule variable is
 -- needed.  We can refine this later.
-loadRule mod decl@(IfaceRule _ _ var _ _ src_loc)
+loadRule mod decl@(IfaceRule _ _ _ var _ _ src_loc)
   = lookupIfaceName var                `thenRn` \ var_name ->
     returnRn (\vis_fn -> vis_fn var_name, (mod, decl))
 
@@ -535,7 +535,7 @@ findAndReadIface doc_str mod_name hi_boot_file
                           (hiModuleNameMismatchWarn wanted_mod read_mod)
                                        `thenRn_`
                         -- check that the package names agree
-                        checkRn 
+                        warnCheckRn 
                           (modulePackage wanted_mod == modulePackage read_mod)
                           (packageNameMismatchWarn wanted_mod read_mod)
                                         `thenRn_`
@@ -677,9 +677,6 @@ warnRedundantSourceImport mod_name
   = ptext SLIT("Unnecessary {- SOURCE -} in the import of module")
           <+> quotes (ppr mod_name)
 
-notLoaded mod
-  = ptext SLIT("Module") <+> quotes (ppr mod) <+> ptext SLIT("is not loaded")
-
 warnSelfImport mod
   = ptext SLIT("Importing my own interface: module") <+> ppr mod
 \end{code}