[commit: ghc] master: SafeHaskell: code wibble. (2d2cd3d)

[David Terei]

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

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/2d2cd3d2df5ca6d1337a4a7657e0d416d64a262e

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

commit 2d2cd3d2df5ca6d1337a4a7657e0d416d64a262e
Author: David Terei <davidterei at gmail.com>
Date:   Thu Jun 16 23:41:20 2011 -0700

    SafeHaskell: code wibble.

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

 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 46d46fb..f9a2980 100644
--- a/compiler/main/HscMain.lhs
+++ b/compiler/main/HscMain.lhs
@@ -821,7 +821,7 @@ checkSafeImports dflags hsc_env tcg_env
     = do
         imps <- mapM condense imports'
         pkgs <- mapM checkSafe imps
-        pkgTransitiveOK pkg_reqs
+        checkPkgTrust pkg_reqs
 
         -- add in trusted package requirements for this module
         let new_trust = emptyImportAvails { imp_trust_pkgs = catMaybes pkgs }
@@ -896,8 +896,8 @@ checkSafeImports dflags hsc_env tcg_env
                             else text "The module itself isn't safe."
 
         -- Here we check the transitive package trust requirements are OK still.
-        pkgTransitiveOK :: [PackageId] -> Hsc ()
-        pkgTransitiveOK pkgs = do
+        checkPkgTrust :: [PackageId] -> Hsc ()
+        checkPkgTrust pkgs = do
             case errors of
                 [] -> return ()
                 _  -> (liftIO . throwIO . mkSrcErr . listToBag) errors