X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Frename%2FRnNames.lhs;h=4cdb241d8eee7cdefea308291d06cd95a8ce70b9;hb=594aa4967f05341c5a2417881e0abd068ab34e9a;hp=bf6e54a4f5a3a4e2ac8a09ca603fa9ec159aaa0d;hpb=958924a2b338aebbcc8a88ba2cab511517762a19;p=ghc-hetmet.git

diff --git a/ghc/compiler/rename/RnNames.lhs b/ghc/compiler/rename/RnNames.lhs
index bf6e54a..4cdb241 100644
--- a/ghc/compiler/rename/RnNames.lhs
+++ b/ghc/compiler/rename/RnNames.lhs
@@ -26,15 +26,17 @@ import TcRnMonad
 
 import FiniteMap
 import PrelNames	( pRELUDE, isUnboundName, main_RDR_Unqual )
-import Module		( Module, moduleUserString, unitModuleEnv, 
+import Module		( Module, moduleString, unitModuleEnv, 
 			  lookupModuleEnv, moduleEnvElts, foldModuleEnv )
 import Name		( Name, nameSrcLoc, nameOccName, nameModule, isWiredInName,
 			  nameParent, nameParent_maybe, isExternalName,
 			  isBuiltInSyntax )
 import NameSet
 import NameEnv
-import OccName		( srcDataName, isTcOcc, occNameFlavour, OccEnv, 
-			  mkOccEnv, lookupOccEnv, emptyOccEnv, extendOccEnv )
+import OccName		( srcDataName, isTcOcc, pprNonVarNameSpace,
+			  occNameSpace,
+			  OccEnv, mkOccEnv, lookupOccEnv, emptyOccEnv,
+			  extendOccEnv )
 import HscTypes		( GenAvailInfo(..), AvailInfo,
 			  HomePackageTable, PackageIfaceTable, 
 			  unQualInScope, 
@@ -683,7 +685,7 @@ reportDeprecations tcg_env
       ,	Just deprec_txt <- lookupDeprec hpt pit name
       = setSrcSpan (importSpecLoc imp_spec) $
 	addWarn (sep [ptext SLIT("Deprecated use of") <+> 
-			occNameFlavour (nameOccName name) <+> 
+			pprNonVarNameSpace (occNameSpace (nameOccName name)) <+> 
 		 	quotes (ppr name),
 		      (parens imp_msg) <> colon,
 		      (ppr deprec_txt) ])
@@ -958,7 +960,7 @@ printMinimalImports imps
 				 (vcat (map ppr_mod_ie mod_ies)) })
    }
   where
-    mkFilename this_mod = moduleUserString this_mod ++ ".imports"
+    mkFilename this_mod = moduleString this_mod ++ ".imports"
     ppr_mod_ie (mod_name, ies) 
 	| mod_name == pRELUDE 
 	= empty