X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2Frename%2FRnSource.lhs;h=9653bdc0f3ccb4b74d3637d5c06936e017393d99;hp=08e68606250f76f84bb004b1e4291c737a087fc3;hb=84923cc7de2a93c22a2f72daf9ac863959efae13;hpb=374c57e586a2951377f041b9c449fd50a07c3f36

diff --git a/compiler/rename/RnSource.lhs b/compiler/rename/RnSource.lhs
index 08e6860..9653bdc 100644
--- a/compiler/rename/RnSource.lhs
+++ b/compiler/rename/RnSource.lhs
@@ -422,11 +422,10 @@ extendTyVarEnvForMethodBinds tyvars thing_inside
 
 \begin{code}
 rnSrcDerivDecl :: DerivDecl RdrName -> RnM (DerivDecl Name, FreeVars)
-rnSrcDerivDecl (DerivDecl ty n)
+rnSrcDerivDecl (DerivDecl ty)
   = do ty' <- rnLHsType (text "a deriving decl") ty
-       n'  <- lookupLocatedOccRn n
-       let fvs = extractHsTyNames ty' `addOneFV` unLoc n'
-       return (DerivDecl ty' n', fvs)
+       let fvs = extractHsTyNames ty'
+       return (DerivDecl ty', fvs)
 \end{code}
 
 %*********************************************************
@@ -831,8 +830,7 @@ rnTySig (tydecl@TyData {tcdCtxt = context, tcdLName = tycon,
       ASSERT( isNothing mb_typats ) -- won't have type patterns
       ASSERT( isNothing derivs )    -- won't have deriving
       ASSERT( isJust sig )          -- will have kind signature
-      do { checkM (not . null $ tyvars) $ addErr needOneIdx   -- #indexes >= 1
-	 ; bindIdxVars (ksig_doc tycon) tyvars $ \tyvars' -> do {
+      do { bindIdxVars (ksig_doc tycon) tyvars $ \tyvars' -> do {
 	 ; tycon' <- lookupLocatedTopBndrRn tycon
 	 ; context' <- rnContext (ksig_doc tycon) context
 	 ; returnM (TyData {tcdND = tcdND tydecl, tcdCtxt = context',