X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Fmain%2FHscTypes.lhs;h=5fd475cffbad46fc929997225126ff07fcd3f421;hb=3721dd37a707d2aacb5cac814410a78096e28a2c;hp=113c386434b83b5cb1a95a77a32eabc14caa5714;hpb=8575cfe27f04474172a2b244bd5a575b4cbe735c;p=ghc-hetmet.git

diff --git a/ghc/compiler/main/HscTypes.lhs b/ghc/compiler/main/HscTypes.lhs
index 113c386..5fd475c 100644
--- a/ghc/compiler/main/HscTypes.lhs
+++ b/ghc/compiler/main/HscTypes.lhs
@@ -93,7 +93,7 @@ import CoreSyn		( IdCoreRule )
 import PrelNames	( isBuiltInSyntaxName )
 import Maybes		( orElse )
 import Outputable
-import SrcLoc		( SrcLoc )
+import SrcLoc		( SrcSpan )
 import UniqSupply	( UniqSupply )
 import Maybe		( fromJust )
 import FastString	( FastString )
@@ -275,7 +275,7 @@ data ModDetails
 data ModGuts
   = ModGuts {
         mg_module   :: !Module,
-	mg_exports  :: !Avails,		-- What it exports
+	mg_exports  :: !NameSet,	-- What it exports
 	mg_deps	    :: !Dependencies,	-- What is below it, directly or otherwise
 	mg_dir_imps :: ![Module],	-- Directly-imported modules; used to
 					--	generate initialisation code
@@ -629,7 +629,7 @@ emptyIfaceFixCache n = defaultFixity
 type FixityEnv = NameEnv FixItem
 
 -- We keep the OccName in the range so that we can generate an interface from it
-data FixItem = FixItem OccName Fixity SrcLoc
+data FixItem = FixItem OccName Fixity SrcSpan
 
 instance Outputable FixItem where
   ppr (FixItem occ fix loc) = ppr fix <+> ppr occ <+> parens (ppr loc)