X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Ftypecheck%2FTcTyFuns.lhs;h=4c5be1c8993ce7d226b2bcc797d1a56eb7ad36a9;hb=ecdaf6bc29d23bd704df8c65442ee08032a585fc;hp=625d4cdd72cd58add922da022bce47d80c27ff92;hpb=30c122df62ec75f9ed7f392f24c2925675bf1d06;p=ghc-hetmet.git diff --git a/compiler/typecheck/TcTyFuns.lhs b/compiler/typecheck/TcTyFuns.lhs index 625d4cd..4c5be1c 100644 --- a/compiler/typecheck/TcTyFuns.lhs +++ b/compiler/typecheck/TcTyFuns.lhs @@ -1152,7 +1152,7 @@ genericNormaliseInsts isWanted fun insts -- else -- dict' = dict `cast` co expr = HsVar $ instToId source_dict - cast_expr = HsWrap (WpCo st_co) expr + cast_expr = HsWrap (WpCast st_co) expr rhs = L (instLocSpan loc) cast_expr binds = instToDictBind target_dict rhs -- return the new inst @@ -1211,9 +1211,9 @@ misMatchMsg :: TidyEnv -> (TcType, TcType) -> (TidyEnv, SDoc) misMatchMsg env0 (ty_act, ty_exp) = let (env1, pp_exp, extra_exp) = ppr_ty env0 ty_exp (env2, pp_act, extra_act) = ppr_ty env1 ty_act - msg = sep [sep [ptext SLIT("Couldn't match expected type") <+> pp_exp, + msg = sep [sep [ptext (sLit "Couldn't match expected type") <+> pp_exp, nest 7 $ - ptext SLIT("against inferred type") <+> pp_act], + ptext (sLit "against inferred type") <+> pp_act], nest 2 (extra_exp $$ extra_act)] in (env2, msg)