Remove getModuleDs; we now just use getModule

2 files changed, 5 insertions, 4 deletions

diff --git a/compiler/vectorise/Vectorise/Generic/PADict.hs b/compiler/vectorise/Vectorise/Generic/PADict.hs
index 96e0dbc225..da95884326 100644
--- a/compiler/vectorise/Vectorise/Generic/PADict.hs
+++ b/compiler/vectorise/Vectorise/Generic/PADict.hs
@@ -13,7 +13,7 @@ import BasicTypes
 import CoreSyn
 import CoreUtils
 import CoreUnfold
-import DsMonad
+import Module
 import TyCon
 import Type
 import Id
@@ -58,7 +58,7 @@ buildPADict vect_tc prepr_ax pdata_tc pdatas_tc repr
  = polyAbstract tvs $ \args ->    -- The args are the dictionaries we lambda abstract over; and they
                                   -- are put in the envt, so when we need a (PA a) we can find it in
                                   -- the envt; they don't include the silent superclass args yet
-   do { mod <- liftDs getModuleDs
+   do { mod <- liftDs getModule
       ; let dfun_name = mkLocalisedOccName mod mkPADFunOcc vect_tc_name
    
           -- The superclass dictionary is a (silent) argument if the tycon is polymorphic...
diff --git a/compiler/vectorise/Vectorise/Monad/Naming.hs b/compiler/vectorise/Vectorise/Monad/Naming.hs
index 30b8a0e1e4..def1ffa58c 100644
--- a/compiler/vectorise/Vectorise/Monad/Naming.hs
+++ b/compiler/vectorise/Vectorise/Monad/Naming.hs
@@ -19,6 +19,7 @@ import DsMonad
 import TcType
 import Type
 import Var
+import Module
 import Name
 import SrcLoc
 import MkId
@@ -37,7 +38,7 @@ import Control.Monad
 --
 mkLocalisedName :: (Maybe String -> OccName -> OccName) -> Name -> VM Name
 mkLocalisedName mk_occ name
-  = do { mod <- liftDs getModuleDs
+  = do { mod <- liftDs getModule
        ; u   <- liftDs newUnique
        ; let occ_name = mkLocalisedOccName mod mk_occ name
 
@@ -86,7 +87,7 @@ cloneVar var = liftM (setIdUnique var) (liftDs newUnique)
 --
 newExportedVar :: OccName -> Type -> VM Var
 newExportedVar occ_name ty 
- = do mod <- liftDs getModuleDs
+ = do mod <- liftDs getModule
       u   <- liftDs newUnique
 
       let name = mkExternalName u mod occ_name noSrcSpan