diff options
Diffstat (limited to 'compiler/rename')
| -rw-r--r-- | compiler/rename/RnEnv.hs | 6 | ||||
| -rw-r--r-- | compiler/rename/RnFixity.hs | 2 | ||||
| -rw-r--r-- | compiler/rename/RnNames.hs | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/compiler/rename/RnEnv.hs b/compiler/rename/RnEnv.hs index d9dbbee891..c84e7bd328 100644 --- a/compiler/rename/RnEnv.hs +++ b/compiler/rename/RnEnv.hs @@ -1266,10 +1266,10 @@ warnIfDeprecated gre@(GRE { gre_name = name, gre_imp = iss }) lookupImpDeprec :: ModIface -> GlobalRdrElt -> Maybe WarningTxt lookupImpDeprec iface gre - = mi_warn_fn iface (greOccName gre) `mplus` -- Bleat if the thing, + = mi_warn_fn (mi_final_exts iface) (greOccName gre) `mplus` -- Bleat if the thing, case gre_par gre of -- or its parent, is warn'd - ParentIs p -> mi_warn_fn iface (nameOccName p) - FldParent { par_is = p } -> mi_warn_fn iface (nameOccName p) + ParentIs p -> mi_warn_fn (mi_final_exts iface) (nameOccName p) + FldParent { par_is = p } -> mi_warn_fn (mi_final_exts iface) (nameOccName p) NoParent -> Nothing {- diff --git a/compiler/rename/RnFixity.hs b/compiler/rename/RnFixity.hs index 198a0441e5..68d1348871 100644 --- a/compiler/rename/RnFixity.hs +++ b/compiler/rename/RnFixity.hs @@ -157,7 +157,7 @@ lookupFixityRn_help' name occ -- loadInterfaceForName will find B.hi even if B is a hidden module, -- and that's what we want. = do { iface <- loadInterfaceForName doc name - ; let mb_fix = mi_fix_fn iface occ + ; let mb_fix = mi_fix_fn (mi_final_exts iface) occ ; let msg = case mb_fix of Nothing -> text "looking up name" <+> ppr name diff --git a/compiler/rename/RnNames.hs b/compiler/rename/RnNames.hs index 738f4c6ab5..7b9a385e48 100644 --- a/compiler/rename/RnNames.hs +++ b/compiler/rename/RnNames.hs @@ -393,8 +393,8 @@ calculateAvails :: DynFlags calculateAvails dflags iface mod_safe' want_boot imported_by = let imp_mod = mi_module iface imp_sem_mod= mi_semantic_module iface - orph_iface = mi_orphan iface - has_finsts = mi_finsts iface + orph_iface = mi_orphan (mi_final_exts iface) + has_finsts = mi_finsts (mi_final_exts iface) deps = mi_deps iface trust = getSafeMode $ mi_trust iface trust_pkg = mi_trust_pkg iface |