X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Ftypecheck%2FTcRnDriver.lhs;h=bd7630397173de7006c61ba191bd5b8b9fa31d04;hb=620531f5074b189bd04d10c88196493b1e2fa692;hp=00f7114908360e082c9b4587cf23cc7569030300;hpb=526c3af1dc98987b6949f4df73c0debccf9875bd;p=ghc-hetmet.git

diff --git a/compiler/typecheck/TcRnDriver.lhs b/compiler/typecheck/TcRnDriver.lhs
index 00f7114..bd76303 100644
--- a/compiler/typecheck/TcRnDriver.lhs
+++ b/compiler/typecheck/TcRnDriver.lhs
@@ -82,6 +82,7 @@ import Outputable
 import DataCon
 import Type
 import Class
+import Data.List ( sortBy )
 
 #ifdef GHCI
 import Linker
@@ -167,12 +168,12 @@ tcRnModule hsc_env hsc_src save_rn_syntax
 		-- thing (especially via 'module Foo' export item)
 		-- That is, only uses in the *body* of the module are complained about
 	traceRn (text "rn3") ;
-	failIfErrsM ;	-- finishDeprecations crashes sometimes 
+	failIfErrsM ;	-- finishWarnings crashes sometimes 
 			-- as a result of typechecker repairs (e.g. unboundNames)
-	tcg_env <- finishDeprecations (hsc_dflags hsc_env) mod_deprec tcg_env ;
+	tcg_env <- finishWarnings (hsc_dflags hsc_env) mod_deprec tcg_env ;
 
 		-- Process the export list
-       traceRn (text "rn4a: before exports");
+        traceRn (text "rn4a: before exports");
 	tcg_env <- rnExports (isJust maybe_mod) export_ies tcg_env ;
 	traceRn (text "rn4b: after exportss") ;
 
@@ -337,7 +338,7 @@ tcRnExtCore hsc_env (HsExtCore this_mod decls src_binds)
 				-- Stubs
 				mg_rdr_env   = emptyGlobalRdrEnv,
 				mg_fix_env   = emptyFixityEnv,
-				mg_deprecs   = NoDeprecs,
+				mg_warns     = NoWarnings,
 				mg_foreign   = NoStubs,
 				mg_hpc_info  = emptyHpcInfo False,
                                 mg_modBreaks = emptyModBreaks,
@@ -1470,8 +1471,16 @@ pprTcGblEnv (TcGblEnv { tcg_type_env  = type_env,
 	 , ppr_fam_insts fam_insts
 	 , vcat (map ppr rules)
 	 , ppr_gen_tycons (typeEnvTyCons type_env)
-	 , ptext (sLit "Dependent modules:") <+> ppr (eltsUFM (imp_dep_mods imports))
-	 , ptext (sLit "Dependent packages:") <+> ppr (imp_dep_pkgs imports)]
+	 , ptext (sLit "Dependent modules:") <+> 
+		ppr (sortBy cmp_mp $ eltsUFM (imp_dep_mods imports))
+	 , ptext (sLit "Dependent packages:") <+> 
+		ppr (sortBy stablePackageIdCmp $ imp_dep_pkgs imports)]
+  where		-- The two uses of sortBy are just to reduce unnecessary
+		-- wobbling in testsuite output
+    cmp_mp (mod_name1, is_boot1) (mod_name2, is_boot2)
+	= (mod_name1 `stableModuleNameCmp` mod_name2)
+		  `thenCmp`	
+	  (is_boot1 `compare` is_boot2)
 
 pprModGuts :: ModGuts -> SDoc
 pprModGuts (ModGuts { mg_types = type_env,