X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2FbasicTypes%2FVarSet.lhs;h=d7e85674bf511aa00356e4cf7f95f32e69a8591a;hb=08652e67c4d5d9a40687f93c286021a867c1bca0;hp=1de03a18610fd067d5287380dc053a1463daab7e;hpb=ad94d40948668032189ad22a0ad741ac1f645f50;p=ghc-hetmet.git

diff --git a/compiler/basicTypes/VarSet.lhs b/compiler/basicTypes/VarSet.lhs
index 1de03a1..d7e8567 100644
--- a/compiler/basicTypes/VarSet.lhs
+++ b/compiler/basicTypes/VarSet.lhs
@@ -4,13 +4,6 @@
 %
 
 \begin{code}
-{-# OPTIONS -w #-}
--- The above warning supression flag is a temporary kludge.
--- While working on this module you are encouraged to remove it and fix
--- any warnings in the module. See
---     http://hackage.haskell.org/trac/ghc/wiki/CodingStyle#Warnings
--- for details
-
 module VarSet (
 	VarSet, IdSet, TyVarSet,
 	emptyVarSet, unitVarSet, mkVarSet,
@@ -29,7 +22,6 @@ module VarSet (
 import Var
 import Unique
 import UniqSet
-import UniqFM
 \end{code}
 
 %************************************************************************
@@ -95,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}