Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : master
http://hackage.haskell.org/trac/ghc/changeset/827598ea72a8018c26553f483e6144d1c8f24868 >--------------------------------------------------------------- commit 827598ea72a8018c26553f483e6144d1c8f24868 Author: Simon Peyton Jones <simo...@microsoft.com> Date: Fri Oct 19 20:27:37 2012 +0100 Wibbles in TcErrors >--------------------------------------------------------------- compiler/typecheck/TcErrors.lhs | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/compiler/typecheck/TcErrors.lhs b/compiler/typecheck/TcErrors.lhs index 31573ee..e009b68 100644 --- a/compiler/typecheck/TcErrors.lhs +++ b/compiler/typecheck/TcErrors.lhs @@ -702,7 +702,7 @@ isUserSkolem ctxt tv is_user_skol_info _ = True misMatchOrCND :: ReportErrCtxt -> Ct -> Maybe SwapFlag -> TcType -> TcType -> SDoc --- If oriented then ty1 is expected, ty2 is actual +-- If oriented then ty1 is actual, ty2 is expected misMatchOrCND ctxt ct oriented ty1 ty2 | null givens || (isRigid ty1 && isRigid ty2) || @@ -714,7 +714,7 @@ misMatchOrCND ctxt ct oriented ty1 ty2 = couldNotDeduce givens ([mkEqPred ty1 ty2], orig) where givens = getUserGivens ctxt - orig = TypeEqOrigin ty1 ty2 + orig = TypeEqOrigin { uo_actual = ty1, uo_expected = ty2 } couldNotDeduce :: [UserGiven] -> (ThetaType, CtOrigin) -> SDoc couldNotDeduce givens (wanteds, orig) _______________________________________________ Cvs-ghc mailing list Cvs-ghc@haskell.org http://www.haskell.org/mailman/listinfo/cvs-ghc
