X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Ftypecheck%2FUnify.lhs;fp=ghc%2Fcompiler%2Ftypecheck%2FUnify.lhs;h=9fba979300f696442d275d7a27a9bb82271d61c2;hb=573ef10b2afd99d3c6a36370a9367609716c97d2;hp=638058718bdcaca585272432cfdf1425cbe7e730;hpb=30f15b4e7d579dc142537342161c460c6b80290b;p=ghc-hetmet.git

diff --git a/ghc/compiler/typecheck/Unify.lhs b/ghc/compiler/typecheck/Unify.lhs
index 6380587..9fba979 100644
--- a/ghc/compiler/typecheck/Unify.lhs
+++ b/ghc/compiler/typecheck/Unify.lhs
@@ -44,7 +44,7 @@ Unify two @TauType@s.  Dead straightforward.
 
 \begin{code}
 unifyTauTy :: TcTauType s -> TcTauType s -> TcM s ()
-unifyTauTy ty1 ty2 
+unifyTauTy ty1 ty2 	-- ty1 expected, ty2 inferred
   = tcAddErrCtxtM (unifyCtxt ty1 ty2) $
     uTys ty1 ty1 ty2 ty2
 \end{code}
@@ -327,14 +327,14 @@ Errors
 ~~~~~~
 
 \begin{code}
-unifyCtxt ty1 ty2
+unifyCtxt ty1 ty2		-- ty1 expected, ty2 inferred
   = zonkTcType ty1	`thenNF_Tc` \ ty1' ->
     zonkTcType ty2	`thenNF_Tc` \ ty2' ->
     returnNF_Tc (err ty1' ty2')
   where
     err ty1' ty2' sty = ppAboves [
-			   ppCat [ppStr "When matching:", ppr sty ty1'],
-			   ppCat [ppStr "      against:", ppr sty ty2']
+			   ppCat [ppStr "Expected:", ppr sty ty1'],
+			   ppCat [ppStr "Inferred:", ppr sty ty2']
 		        ]
 
 unifyMisMatch ty1 ty2 sty