Remove javaGen; part of trac #2243

[ghc-hetmet.git] / compiler / types / FamInstEnv.lhs

diff --git a/compiler/types/FamInstEnv.lhs b/compiler/types/FamInstEnv.lhs
index f442e02..28a8770 100644 (file)
--- a/compiler/types/FamInstEnv.lhs
+++ b/compiler/types/FamInstEnv.lhs
@@ -23,9 +23,8 @@ module FamInstEnv (
 #include "HsVersions.h"
 
 import InstEnv
-import Unify
-import TcGadt
 import TcType
+import Unify
 import Type
 import TypeRep
 import TyCon
@@ -37,6 +36,7 @@ import UniqFM
 import Outputable
 import Maybes
 import Util
+import FastString
 
 import Maybe
 \end{code}
@@ -88,16 +88,16 @@ instance Outputable FamInst where
 pprFamInst :: FamInst -> SDoc
 pprFamInst famInst
   = hang (pprFamInstHdr famInst)
-       2 (ptext SLIT("--") <+> pprNameLoc (getName famInst))
+       2 (ptext (sLit "--") <+> pprNameLoc (getName famInst))
 
 pprFamInstHdr :: FamInst -> SDoc
 pprFamInstHdr (FamInst {fi_fam = fam, fi_tys = tys, fi_tycon = tycon})
   = pprTyConSort <+> pprHead
   where
     pprHead = pprTypeApp fam (ppr fam) tys
-    pprTyConSort | isDataTyCon tycon = ptext SLIT("data instance")
-                | isNewTyCon  tycon = ptext SLIT("newtype instance")
-                | isSynTyCon  tycon = ptext SLIT("type instance")
+    pprTyConSort | isDataTyCon tycon = ptext (sLit "data instance")
+                | isNewTyCon  tycon = ptext (sLit "newtype instance")
+                | isSynTyCon  tycon = ptext (sLit "type instance")
                 | otherwise         = panic "FamInstEnv.pprFamInstHdr"
 
 pprFamInsts :: [FamInst] -> SDoc
@@ -428,9 +428,6 @@ normaliseType env (FunTy ty1 ty2)
 normaliseType env (ForAllTy tyvar ty1)
   = let (coi,nty1) = normaliseType env ty1
     in  (mkForAllTyCoI tyvar coi,ForAllTy tyvar nty1)
-normaliseType env (NoteTy note ty1)
-  = let (coi,nty1) = normaliseType env ty1
-    in  (coi,NoteTy note nty1)
 normaliseType _   ty@(TyVarTy _)
   = (IdCo,ty)
 normaliseType env (PredTy predty)