X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2FbasicTypes%2FVarSet.lhs;h=d4293ba459d636a1be75ef595f1e2ebf068fe088;hb=7163be78dfc760f2b288c78260cb2929b6253aa1;hp=812213d39696026aac837b8225673f08352af00e;hpb=7745c6095145f1be0ca8fff76ef558ca7ad2ebed;p=ghc-hetmet.git

diff --git a/compiler/basicTypes/VarSet.lhs b/compiler/basicTypes/VarSet.lhs
index 812213d..d4293ba 100644
--- 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 (
@@ -17,12 +17,13 @@ module VarSet (
 	elemVarSetByKey
     ) where
 
+-- XXX This define is a bit of a hack, and should be done more nicely
+#define FAST_STRING_NOT_NEEDED 1
 #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 +89,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}