X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Ftypecheck%2FFamInst.lhs;h=eed79ca2c7c121a31f9f18528bcc24d1292e02f3;hb=5699ec476d64d48b7fcf6812238406e1eea91bef;hp=46df395052994048b47c7f0b372677c08d636795;hpb=ad94d40948668032189ad22a0ad741ac1f645f50;p=ghc-hetmet.git

diff --git a/compiler/typecheck/FamInst.lhs b/compiler/typecheck/FamInst.lhs
index 46df395..eed79ca 100644
--- a/compiler/typecheck/FamInst.lhs
+++ b/compiler/typecheck/FamInst.lhs
@@ -5,15 +5,13 @@ The @FamInst@ type: family instance heads
 -- The above warning supression flag is a temporary kludge.
 -- While working on this module you are encouraged to remove it and fix
 -- any warnings in the module. See
---     http://hackage.haskell.org/trac/ghc/wiki/CodingStyle#Warnings
+--     http://hackage.haskell.org/trac/ghc/wiki/Commentary/CodingStyle#Warnings
 -- for details
 
 module FamInst ( 
         checkFamInstConsistency, tcExtendLocalFamInstEnv
     ) where
 
-#include "HsVersions.h"
-
 import HscTypes
 import FamInstEnv
 import TcMType
@@ -25,8 +23,9 @@ import Name
 import Module
 import SrcLoc
 import Outputable
-import UniqFM
+import LazyUniqFM
 import FiniteMap
+import FastString
 
 import Maybe
 import Monad
@@ -211,7 +210,7 @@ checkForConflicts inst_envs famInst
 
 conflictInstErr famInst conflictingFamInst
   = addFamInstLoc famInst $
-    addErr (hang (ptext SLIT("Conflicting family instance declarations:"))
+    addErr (hang (ptext (sLit "Conflicting family instance declarations:"))
 	       2 (pprFamInsts [famInst, conflictingFamInst]))
 
 addFamInstLoc famInst thing_inside