Repository : ssh://darcs.haskell.org//srv/darcs/ghc

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/8ebe525b9e7988355c236dfe0dd18187522e377e

>---------------------------------------------------------------

commit 8ebe525b9e7988355c236dfe0dd18187522e377e
Author: David Terei <[email protected]>
Date:   Fri Jun 10 01:24:46 2011 -0700

    SafeHaskell: Improve safe import fail error message

>---------------------------------------------------------------

 compiler/main/HscMain.lhs |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/compiler/main/HscMain.lhs b/compiler/main/HscMain.lhs
index c4e5aba..1ffed43 100644
--- a/compiler/main/HscMain.lhs
+++ b/compiler/main/HscMain.lhs
@@ -861,8 +861,8 @@ checkSafeImports dflags hsc_env tcg_env
             | otherwise = trusted $ getPackageDetails (pkgState dflags)
                                                       (modulePackageId m)
 
-        -- Is a module a Safe importable? Return Nothing if True, or a String
-        -- if it isn't containing the reason it isn't
+        -- Is a module trusted? Return Nothing if True, or a String
+        -- if it isn't, containing the reason it isn't
         isModSafe :: Module -> SrcSpan -> Hsc (Maybe SDoc)
         isModSafe m l = do
             iface <- lookup' m
@@ -894,7 +894,7 @@ checkSafeImports dflags hsc_env tcg_env
             case module_safe of
                 Nothing -> return ()
                 Just s  -> liftIO $ throwIO $ mkSrcErr $ unitBag $ 
mkPlainErrMsg l
-                            $ text "Safe import of" <+> ppr m <+> text "can't 
be met!"
+                            $ text ppr m <+> text "can't be safely imported!"
                                 <+> s
 
 --------------------------------------------------------------



_______________________________________________
Cvs-ghc mailing list
[email protected]
http://www.haskell.org/mailman/listinfo/cvs-ghc

Reply via email to