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 f74791d..d7e8567 100644 (file)
--- a/compiler/basicTypes/VarSet.lhs
+++ b/compiler/basicTypes/VarSet.lhs
@@ -4,13 +4,6 @@
 %
 
 \begin{code}
-{-# OPTIONS_GHC -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/WorkingConventions#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}