projects
/
ghc-hetmet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
55e0ee4
)
(F)SLIT -> (f)sLit in FamInst
author
Ian Lynagh
<igloo@earth.li>
Sat, 12 Apr 2008 16:20:33 +0000
(16:20 +0000)
committer
Ian Lynagh
<igloo@earth.li>
Sat, 12 Apr 2008 16:20:33 +0000
(16:20 +0000)
compiler/typecheck/FamInst.lhs
patch
|
blob
|
history
diff --git
a/compiler/typecheck/FamInst.lhs
b/compiler/typecheck/FamInst.lhs
index
224a960
..
eed79ca
100644
(file)
--- a/
compiler/typecheck/FamInst.lhs
+++ b/
compiler/typecheck/FamInst.lhs
@@
-12,8
+12,6
@@
module FamInst (
checkFamInstConsistency, tcExtendLocalFamInstEnv
) where
checkFamInstConsistency, tcExtendLocalFamInstEnv
) where
-#include "HsVersions.h"
-
import HscTypes
import FamInstEnv
import TcMType
import HscTypes
import FamInstEnv
import TcMType
@@
-212,7
+210,7
@@
checkForConflicts inst_envs famInst
conflictInstErr famInst conflictingFamInst
= addFamInstLoc 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
2 (pprFamInsts [famInst, conflictingFamInst]))
addFamInstLoc famInst thing_inside