projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote branch 'origin/master'
[ghc-hetmet.git]
/
compiler
/
typecheck
/
TcGenDeriv.lhs
diff --git
a/compiler/typecheck/TcGenDeriv.lhs
b/compiler/typecheck/TcGenDeriv.lhs
index
dba87d2
..
310f3fd
100644
(file)
--- a/
compiler/typecheck/TcGenDeriv.lhs
+++ b/
compiler/typecheck/TcGenDeriv.lhs
@@
-50,7
+50,6
@@
import TcType
import TysPrim
import TysWiredIn
import Type
import TysPrim
import TysWiredIn
import Type
-import Var( TyVar )
import TypeRep
import VarSet
import State
import TypeRep
import VarSet
import State
@@
-1837,7
+1836,7
@@
assoc_ty_id cls_str _ tbl ty
text "for primitive type" <+> ppr ty)
| otherwise = head res
where
text "for primitive type" <+> ppr ty)
| otherwise = head res
where
- res = [id | (ty',id) <- tbl, ty `tcEqType` ty']
+ res = [id | (ty',id) <- tbl, ty `eqType` ty']
-----------------------------------------------------------------------
-----------------------------------------------------------------------