Convert more UniqFM's back to LazyUniqFM's

[ghc-hetmet.git] / compiler / main / Finder.lhs

diff --git a/compiler/main/Finder.lhs b/compiler/main/Finder.lhs
index 61bf196..b76bd97 100644 (file)
--- a/compiler/main/Finder.lhs
+++ b/compiler/main/Finder.lhs
@@ -36,7 +36,7 @@ import PrelNames        ( gHC_PRIM )
 import DynFlags                ( DynFlags(..), isOneShot, GhcMode(..) )
 import Outputable
 import FiniteMap
-import UniqFM
+import LazyUniqFM
 import Maybes          ( expectJust )
 
 import Data.IORef      ( IORef, writeIORef, readIORef, modifyIORef )
@@ -481,9 +481,9 @@ mkStubPaths dflags mod location
   = let
         stubdir = stubDir dflags
 
-               mod_basename = dots_to_slashes (moduleNameString mod)
-               src_basename = basenameOf (expectJust "mkStubPaths" 
-                                               (ml_hs_file location))
+        mod_basename = moduleNameSlashes mod
+        src_basename = dropExtension $ expectJust "mkStubPaths" 
+                                                  (ml_hs_file location)
 
         stub_basename0
             | Just dir <- stubdir = dir </> mod_basename
@@ -532,12 +532,6 @@ findObjectLinkable mod obj_fn obj_time = do
        else return (LM obj_time mod [DotO obj_fn])
 
 -- -----------------------------------------------------------------------------
--- Utils
-
-dots_to_slashes :: String -> String
-dots_to_slashes = map (\c -> if c == '.' then '/' else c)
-
--- -----------------------------------------------------------------------------
 -- Error messages
 
 cannotFindModule :: DynFlags -> ModuleName -> FindResult -> SDoc