Warning police

diff --git a/compiler/simplCore/Simplify.lhs b/compiler/simplCore/Simplify.lhs
index cab6460..f27dcab 100644 (file)
--- a/compiler/simplCore/Simplify.lhs
+++ b/compiler/simplCore/Simplify.lhs
@@ -17,8 +17,7 @@ import Id
 import Var
 import IdInfo
 import Coercion
 import Var
 import IdInfo
 import Coercion

-import DataCon         ( dataConTyCon, dataConRepStrictness, dataConUnivTyVars )
-import TyCon           ( tyConArity )
+import DataCon         ( dataConRepStrictness, dataConUnivTyVars )

 import CoreSyn
 import NewDemand       ( isStrictDmd )
 import PprCore         ( pprParendExpr, pprCoreExpr )
 import CoreSyn
 import NewDemand       ( isStrictDmd )
 import PprCore         ( pprParendExpr, pprCoreExpr )

diff --git a/compiler/typecheck/TcTyDecls.lhs b/compiler/typecheck/TcTyDecls.lhs
index c1a3389..d05ade3 100644 (file)
--- a/compiler/typecheck/TcTyDecls.lhs
+++ b/compiler/typecheck/TcTyDecls.lhs
@@ -24,8 +24,6 @@ import HscTypes
 import TyCon
 import Class
 import DataCon
 import TyCon
 import Class
 import DataCon

-import Var
-import VarSet

 import Name
 import NameEnv
 import NameSet
 import Name
 import NameEnv
 import NameSet

@@ -280,6 +278,7 @@ new_tc_rhs tc = snd (newTyConRhs tc)        -- Ignore the type variables
 
 getTyCon (ATyCon tc) = tc
 getTyCon (AClass cl) = classTyCon cl
 
 getTyCon (ATyCon tc) = tc
 getTyCon (AClass cl) = classTyCon cl

+getTyCon other       = panic "getTyCon"

 
 findLoopBreakers :: [(TyCon, [TyCon])] -> [Name]
 -- Finds a set of tycons that cut all loops
 
 findLoopBreakers :: [(TyCon, [TyCon])] -> [Name]
 -- Finds a set of tycons that cut all loops

@@ -312,6 +311,7 @@ tcTyConsOfType ty
      go (PredTy (IParam _ ty))     = go ty
      go (PredTy (ClassP cls tys))  = go_tc (classTyCon cls) tys
      go (ForAllTy _ ty)                   = go ty
      go (PredTy (IParam _ ty))     = go ty
      go (PredTy (ClassP cls tys))  = go_tc (classTyCon cls) tys
      go (ForAllTy _ ty)                   = go ty

+     go other                     = panic "tcTyConsOfType"

 
      go_tc tc tys = extendNameEnv (go_s tys) (tyConName tc) tc
      go_s tys = foldr (plusNameEnv . go) emptyNameEnv tys
 
      go_tc tc tys = extendNameEnv (go_s tys) (tyConName tc) tc
      go_s tys = foldr (plusNameEnv . go) emptyNameEnv tys