projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix Trac #2246; overhaul handling of overloaded literals
[ghc-hetmet.git]
/
compiler
/
typecheck
/
FamInst.lhs
diff --git
a/compiler/typecheck/FamInst.lhs
b/compiler/typecheck/FamInst.lhs
index
2da3966
..
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
@@
-25,8
+23,9
@@
import Name
import Module
import SrcLoc
import Outputable
import Module
import SrcLoc
import Outputable
-import UniqFM
+import LazyUniqFM
import FiniteMap
import FiniteMap
+import FastString
import Maybe
import Monad
import Maybe
import Monad
@@
-211,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