[commit: ghc] ghc-7.10: TcErrors: mkErrorMsgFromCt is just mkErrorMsg (d70e0ed)

git at git.haskell.org git at git.haskell.org
Tue Sep 29 16:09:56 UTC 2015


Repository : ssh://git@git.haskell.org/ghc

On branch  : ghc-7.10
Link       : http://ghc.haskell.org/trac/ghc/changeset/d70e0ede3b51c982e4a2032641d494f0066a8d78/ghc

>---------------------------------------------------------------

commit d70e0ede3b51c982e4a2032641d494f0066a8d78
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Thu Sep 24 02:13:00 2015 +0200

    TcErrors: mkErrorMsgFromCt is just mkErrorMsg


>---------------------------------------------------------------

d70e0ede3b51c982e4a2032641d494f0066a8d78
 compiler/typecheck/TcErrors.hs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/compiler/typecheck/TcErrors.hs b/compiler/typecheck/TcErrors.hs
index 9272fc2..2af9c23 100644
--- a/compiler/typecheck/TcErrors.hs
+++ b/compiler/typecheck/TcErrors.hs
@@ -819,9 +819,9 @@ mkTyVarEqErr dflags ctxt extra ct oriented tv1 ty2
                       ppr (isTyVarUnderDatatype tv1 ty2))
      (ctEqRel ct == ReprEq && not (isTyVarUnderDatatype tv1 ty2))
      -- the cases below don't really apply to ReprEq (except occurs check)
-  = mkErrorMsgFromCt ctxt ct (vcat [ misMatchOrCND ctxt ct oriented ty1 ty2
-                                   , extraTyVarInfo ctxt tv1 ty2
-                                   , extra ])
+  = mkErrorMsg ctxt ct (vcat [ misMatchOrCND ctxt ct oriented ty1 ty2
+                             , extraTyVarInfo ctxt tv1 ty2
+                             , extra ])
 
   -- So tv is a meta tyvar (or started that way before we
   -- generalised it).  So presumably it is an *untouchable*



More information about the ghc-commits mailing list