Don't import FastString in HsVersions.h

[ghc-hetmet.git] / compiler / basicTypes / VarSet.lhs

diff --git a/compiler/basicTypes/VarSet.lhs b/compiler/basicTypes/VarSet.lhs
index 812213d..d7e8567 100644 (file)
--- a/compiler/basicTypes/VarSet.lhs
+++ b/compiler/basicTypes/VarSet.lhs
@@ -1,7 +1,7 @@
 %
+% (c) The University of Glasgow 2006
 % (c) The GRASP/AQUA Project, Glasgow University, 1992-1998
 %
-\section{@VarSet@: Variable sets}
 
 \begin{code}
 module VarSet (
@@ -19,10 +19,9 @@ module VarSet (
 
 #include "HsVersions.h"
 
-import Var             ( Var, Id, TyVar )
-import Unique          ( Unique )
+import Var
+import Unique
 import UniqSet
-import UniqFM          ( delFromUFM_Directly, addToUFM_C )
 \end{code}
 
 %************************************************************************
@@ -88,8 +87,8 @@ lookupVarSet  = lookupUniqSet
 mapVarSet      = mapUniqSet
 sizeVarSet     = sizeUniqSet
 filterVarSet   = filterUniqSet
-extendVarSet_C combine s x = addToUFM_C combine s x x
-delVarSetByKey = delFromUFM_Directly   -- Can't be bothered to add this to UniqSet
+extendVarSet_C = addOneToUniqSet_C
+delVarSetByKey = delOneFromUniqSet_Directly
 elemVarSetByKey        = elemUniqSet_Directly
 \end{code}