From 94a28821c91acc060baa966a64e23e1dbff3d069 Mon Sep 17 00:00:00 2001
From: simonpj <unknown>
Date: Wed, 31 Dec 2003 08:22:36 +0000
Subject: [PATCH] [project @ 2003-12-31 08:21:52 by simonpj] Trim imports

---
 ghc/compiler/basicTypes/RdrName.lhs |   12 +++---------
 ghc/compiler/iface/TcIface.lhs      |    3 +--
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/ghc/compiler/basicTypes/RdrName.lhs b/ghc/compiler/basicTypes/RdrName.lhs
index 62132c3..d858dbc 100644
--- a/ghc/compiler/basicTypes/RdrName.lhs
+++ b/ghc/compiler/basicTypes/RdrName.lhs
@@ -50,9 +50,7 @@ import OccName	( NameSpace, varName,
 import Module   ( ModuleName, mkModuleNameFS	)
 import Name	( Name, NamedThing(getName), nameModuleName, nameParent_maybe,
 		  nameOccName, isExternalName, nameSrcLoc )
-import Maybes	( seqMaybe )
 import SrcLoc	( isGoodSrcLoc, SrcSpan )
-import BasicTypes( DeprecTxt )
 import Outputable
 import Util	( thenCmp )
 \end{code}
@@ -312,8 +310,7 @@ globalRdrEnvElts env = foldOccEnv (++) [] env
 
 data GlobalRdrElt 
   = GRE { gre_name   :: Name,
-	  gre_prov   :: Provenance,	-- Why it's in scope
-	  gre_deprec :: Maybe DeprecTxt	-- Whether this name is deprecated
+	  gre_prov   :: Provenance	-- Why it's in scope
     }
 
 instance Outputable GlobalRdrElt where
@@ -391,11 +388,8 @@ insertGRE new_g (old_g : old_gs)
 plusGRE :: GlobalRdrElt -> GlobalRdrElt -> GlobalRdrElt
 -- Used when the gre_name fields match
 plusGRE g1 g2
-  = GRE { gre_name   = gre_name g1,
-	  gre_prov   = gre_prov g1 `plusProv` gre_prov g2,
-	  gre_deprec = gre_deprec g1 `seqMaybe` gre_deprec g2 }
-	-- Could the deprecs be different?  If we re-export
-	-- something deprecated, is it propagated?  I forget.
+  = GRE { gre_name = gre_name g1,
+	  gre_prov = gre_prov g1 `plusProv` gre_prov g2 }
 \end{code}
 
 
diff --git a/ghc/compiler/iface/TcIface.lhs b/ghc/compiler/iface/TcIface.lhs
index 1eb7982..1d2d941 100644
--- a/ghc/compiler/iface/TcIface.lhs
+++ b/ghc/compiler/iface/TcIface.lhs
@@ -20,8 +20,7 @@ import IfaceEnv		( lookupIfaceTop, newGlobalBinder, lookupOrig,
 			  newIfaceName, newIfaceNames )
 import BuildTyCl	( buildSynTyCon, buildAlgTyCon, buildDataCon, buildClass )
 import TcRnMonad
-import Type		( Kind, openTypeKind, liftedTypeKind, 
-			  unliftedTypeKind, mkArrowKind, splitTyConApp, 
+import Type		( liftedTypeKind, splitTyConApp, 
 			  mkTyVarTys, mkGenTyConApp, mkTyVarTys, ThetaType, pprClassPred )
 import TypeRep		( Type(..), PredType(..) )
 import TyCon		( TyCon, tyConName )
-- 
1.7.10.4