summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Terei <davidterei@gmail.com>2011-06-16 23:41:20 -0700
committerDavid Terei <davidterei@gmail.com>2011-06-17 20:40:35 -0700
commit2d2cd3d2df5ca6d1337a4a7657e0d416d64a262e (patch)
tree8f8d740ef5a2844baad7e0d50ae1d30b0ff0943c
parentb260034af148e5bf35a54fe307c2e5dc5b1bd647 (diff)
downloadhaskell-2d2cd3d2df5ca6d1337a4a7657e0d416d64a262e.tar.gz
SafeHaskell: code wibble.
-rw-r--r--compiler/main/HscMain.lhs6
1 files changed, 3 insertions, 3 deletions
diff --git a/compiler/main/HscMain.lhs b/compiler/main/HscMain.lhs
index 46d46fbd4c..f9a2980895 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