Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : master
http://hackage.haskell.org/trac/ghc/changeset/f04bbfdb0e8187c6ace27fc3a5627a8910310241 >--------------------------------------------------------------- commit f04bbfdb0e8187c6ace27fc3a5627a8910310241 Author: David Terei <[email protected]> Date: Tue May 10 16:36:44 2011 -0700 SafeHaskell: Fix a warning stopping validation >--------------------------------------------------------------- compiler/typecheck/TcErrors.lhs | 4 ++-- ghc/InteractiveUI.hs | 8 +++++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/compiler/typecheck/TcErrors.lhs b/compiler/typecheck/TcErrors.lhs index 29a98ac..d43ba77 100644 --- a/compiler/typecheck/TcErrors.lhs +++ b/compiler/typecheck/TcErrors.lhs @@ -631,10 +631,10 @@ reportOverlap ctxt inst_envs orig pred@(ClassP clas tys) -- Overlap error because of SafeHaskell (first match should be the most -- specific match) - mk_overlap_msg (matches, unifiers, True) + mk_overlap_msg (matches, _unifiers, True) = ASSERT( length matches > 1 ) vcat [ addArising orig (ptext (sLit "Unsafe overlapping instances for") - <+> pprPred pred) + <+> pprPredTy pred) , sep [ptext (sLit "The matching instance is") <> colon, nest 2 (pprInstance $ head ispecs)] , vcat [ ptext $ sLit "It is compiled in a Safe module and as such can only" diff --git a/ghc/InteractiveUI.hs b/ghc/InteractiveUI.hs index 2d8d6ff..8b4422e 100644 --- a/ghc/InteractiveUI.hs +++ b/ghc/InteractiveUI.hs @@ -1794,10 +1794,12 @@ showPackages = do liftIO $ putStrLn $ showSDoc $ vcat $ text ("active package flags:"++if null pkg_flags then " none" else "") : map showFlag pkg_flags - where showFlag (ExposePackage p) = text $ " -package " ++ p - showFlag (HidePackage p) = text $ " -hide-package " ++ p - showFlag (IgnorePackage p) = text $ " -ignore-package " ++ p + where showFlag (ExposePackage p) = text $ " -package " ++ p + showFlag (HidePackage p) = text $ " -hide-package " ++ p + showFlag (IgnorePackage p) = text $ " -ignore-package " ++ p showFlag (ExposePackageId p) = text $ " -package-id " ++ p + showFlag (TrustPackage p) = text $ " -trust " ++ p + showFlag (DistrustPackage p) = text $ " -distrust " ++ p showLanguages :: GHCi () showLanguages = do _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
