X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Ftypecheck%2FTcTyFuns.lhs;h=4c5be1c8993ce7d226b2bcc797d1a56eb7ad36a9;hb=cae75f82226638691cfa1e85fc168f4b65ddce4d;hp=3bd5fb60213d14148117dcf0548e09fb8e8481a5;hpb=b5a8dd88e3939cf547be50ab62bae84f5bf0398d;p=ghc-hetmet.git

diff --git a/compiler/typecheck/TcTyFuns.lhs b/compiler/typecheck/TcTyFuns.lhs
index 3bd5fb6..4c5be1c 100644
--- a/compiler/typecheck/TcTyFuns.lhs
+++ b/compiler/typecheck/TcTyFuns.lhs
@@ -35,6 +35,7 @@ import Bag
 import Outputable
 import SrcLoc	( Located(..) )
 import Maybes
+import FastString
 
 -- standard
 import Data.List
@@ -229,10 +230,6 @@ tcGenericNormaliseFamInst fun (ForAllTy tyvar ty1)
   = do 	{ (coi,nty1) <- tcGenericNormaliseFamInst fun ty1
 	; return (mkForAllTyCoI tyvar coi, mkForAllTy tyvar nty1)
 	}
-tcGenericNormaliseFamInst fun (NoteTy note ty1)
-  = do	{ (coi,nty1) <- tcGenericNormaliseFamInst fun ty1
-	; return (coi, NoteTy note nty1)
-	}
 tcGenericNormaliseFamInst fun ty@(TyVarTy tv)
   | isTcTyVar tv
   = do	{ traceTc (text "tcGenericNormaliseFamInst" <+> ppr ty)
@@ -1155,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
@@ -1214,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)