Tidy-up sweep, following the Great Skolemisation Simplification

[ghc-hetmet.git] / compiler / typecheck / TcClassDcl.lhs

diff --git a/compiler/typecheck/TcClassDcl.lhs b/compiler/typecheck/TcClassDcl.lhs
index a4a00c9..839a5a2 100644 (file)
--- a/compiler/typecheck/TcClassDcl.lhs
+++ b/compiler/typecheck/TcClassDcl.lhs
@@ -35,7 +35,6 @@ import MkId
 import Id
 import Name
 import Var
 import Id
 import Name
 import Var

-import VarSet

 import NameEnv
 import NameSet
 import Outputable
 import NameEnv
 import NameSet
 import Outputable

@@ -220,7 +219,7 @@ tcDefMeth clas tyvars this_dict binds_in sig_fn prag_fn (sel_id, dm_info)
               prags         = prag_fn sel_name
 
         ; dm_id_w_inline <- addInlinePrags dm_id prags
               prags         = prag_fn sel_name
 
         ; dm_id_w_inline <- addInlinePrags dm_id prags

-        ; spec_prags     <- tcSpecPrags True dm_id prags
+        ; spec_prags     <- tcSpecPrags dm_id prags

 
         ; warnTc (not (null spec_prags))
                  (ptext (sLit "Ignoring SPECIALISE pragmas on default method") 
 
         ; warnTc (not (null spec_prags))
                  (ptext (sLit "Ignoring SPECIALISE pragmas on default method") 

@@ -255,7 +254,7 @@ tcInstanceMethodBody skol_info tyvars dfun_ev_vars
                             -- NB: the binding is always a FunBind
 
        ; (ev_binds, (tc_bind, _)) 
                             -- NB: the binding is always a FunBind
 
        ; (ev_binds, (tc_bind, _)) 

-               <- checkConstraints skol_info emptyVarSet tyvars full_given $
+               <- checkConstraints skol_info tyvars full_given $

                  tcExtendIdEnv [local_meth_id] $
                  tcPolyBinds TopLevel meth_sig_fn no_prag_fn 
                             NonRecursive NonRecursive
                  tcExtendIdEnv [local_meth_id] $
                  tcPolyBinds TopLevel meth_sig_fn no_prag_fn 
                             NonRecursive NonRecursive