Remove more uses of stdout and stderr

2 files changed, 11 insertions, 9 deletions

diff --git a/compiler/vectorise/Vectorise/Monad.hs b/compiler/vectorise/Vectorise/Monad.hs
index 426682cea8..2784868d8e 100644
--- a/compiler/vectorise/Vectorise/Monad.hs
+++ b/compiler/vectorise/Vectorise/Monad.hs
@@ -43,8 +43,6 @@ import Name
 import ErrUtils
 import Outputable
 
-import System.IO
-
 
 -- |Run a vectorisation computation.
 --
@@ -69,7 +67,9 @@ initV hsc_env guts info thing_inside
        ; return res
        }
   where
-    dumpIfVtTrace = dumpIfSet_dyn (hsc_dflags hsc_env) Opt_D_dump_vt_trace
+    dflags = hsc_dflags hsc_env
+
+    dumpIfVtTrace = dumpIfSet_dyn dflags Opt_D_dump_vt_trace
     
     bindsToIds (NonRec v _)   = [v]
     bindsToIds (Rec    binds) = map fst binds
@@ -100,7 +100,7 @@ initV hsc_env guts info thing_inside
                Yes genv _ x -> return $ Just (new_info genv, x)
                No reason    -> do { unqual <- mkPrintUnqualifiedDs
                                   ; liftIO $ 
-                                      printForUser stderr unqual $ 
+                                      printInfoForUser dflags unqual $ 
                                         mkDumpDoc "Warning: vectorisation failure:" reason
                                   ; return Nothing
                                   }
diff --git a/compiler/vectorise/Vectorise/Monad/Base.hs b/compiler/vectorise/Vectorise/Monad/Base.hs
index 91a9552a7e..8483aa8002 100644
--- a/compiler/vectorise/Vectorise/Monad/Base.hs
+++ b/compiler/vectorise/Vectorise/Monad/Base.hs
@@ -37,7 +37,6 @@ import DynFlags
 import StaticFlags
 
 import Control.Monad
-import System.IO (stderr)
 
 
 -- The Vectorisation Monad ----------------------------------------------------
@@ -112,8 +111,9 @@ maybeCantVectoriseM s d p
 --
 emitVt :: String -> SDoc -> VM () 
 emitVt herald doc
-  = liftDs $
-      liftIO . printForUser stderr alwaysQualify $
+  = liftDs $ do
+      dflags <- getDynFlags
+      liftIO . printInfoForUser dflags alwaysQualify $
         hang (text herald) 2 doc
 
 -- |Output a trace message if -ddump-vt-trace is active.
@@ -140,7 +140,8 @@ dumpOptVt flag header doc
 dumpVt :: String -> SDoc -> VM ()
 dumpVt header doc 
   = do { unqual <- liftDs mkPrintUnqualifiedDs
-       ; liftIO $ printForUser stderr unqual (mkDumpDoc header doc)
+       ; dflags <- liftDs getDynFlags
+       ; liftIO $ printInfoForUser dflags unqual (mkDumpDoc header doc)
        }
 
 
@@ -185,8 +186,9 @@ tryErrV (VM p) = VM $ \bi genv lenv ->
     case r of
       Yes genv' lenv' x -> return (Yes genv' lenv' (Just x))
       No reason         -> do { unqual <- mkPrintUnqualifiedDs
+                              ; dflags <- getDynFlags
                               ; liftIO $ 
-                                  printForUser stderr unqual $ 
+                                  printInfoForUser dflags unqual $
                                     text "Warning: vectorisation failure:" <+> reason
                               ; return (Yes genv  lenv  Nothing)
                               }