diff options
| author | Edward Z. Yang <ezyang@cs.stanford.edu> | 2016-10-06 00:17:15 -0700 |
|---|---|---|
| committer | Edward Z. Yang <ezyang@cs.stanford.edu> | 2016-10-08 01:37:33 -0700 |
| commit | 4e8a0607140b23561248a41aeaf837224aa6315b (patch) | |
| tree | 8e03945afe5c40c13b41667e0175f14db15d0780 /ghc | |
| parent | 00b530d5402aaa37e4085ecdcae0ae54454736c1 (diff) | |
| download | haskell-4e8a0607140b23561248a41aeaf837224aa6315b.tar.gz | |
Distinguish between UnitId and InstalledUnitId.
Signed-off-by: Edward Z. Yang <ezyang@cs.stanford.edu>
Diffstat (limited to 'ghc')
| -rw-r--r-- | ghc/GHCi/UI.hs | 5 | ||||
| -rw-r--r-- | ghc/Main.hs | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/ghc/GHCi/UI.hs b/ghc/GHCi/UI.hs index e3a56d6a06..3cc3f5c575 100644 --- a/ghc/GHCi/UI.hs +++ b/ghc/GHCi/UI.hs @@ -54,7 +54,8 @@ import HscTypes ( tyThingParent_maybe, handleFlagWarnings, getSafeMode, hsc_IC, setInteractivePrintName, hsc_dflags, msObjFilePath ) import Module import Name -import Packages ( trusted, getPackageDetails, listVisibleModuleNames, pprFlag ) +import Packages ( trusted, getPackageDetails, getInstalledPackageDetails, + listVisibleModuleNames, pprFlag ) import PprTyThing import PrelNames import RdrName ( RdrName, getGRE_NameQualifier_maybes, getRdrName ) @@ -2056,7 +2057,7 @@ isSafeModule m = do tallyPkgs dflags deps | not (packageTrustOn dflags) = ([], []) | otherwise = partition part deps - where part pkg = trusted $ getPackageDetails dflags pkg + where part pkg = trusted $ getInstalledPackageDetails dflags pkg ----------------------------------------------------------------------------- -- :browse diff --git a/ghc/Main.hs b/ghc/Main.hs index 9fda91979c..f8049d668c 100644 --- a/ghc/Main.hs +++ b/ghc/Main.hs @@ -60,7 +60,7 @@ import MonadUtils ( liftIO ) -- Imports for --abi-hash import LoadIface ( loadUserInterface ) import Module ( mkModuleName ) -import Finder ( findImportedModule, cannotFindInterface ) +import Finder ( findImportedModule, cannotFindModule ) import TcRnMonad ( initIfaceCheck ) import Binary ( openBinMem, put_, fingerprintBinMem ) @@ -890,7 +890,7 @@ abiHash strs = do case r of Found _ m -> return m _error -> throwGhcException $ CmdLineError $ showSDoc dflags $ - cannotFindInterface dflags modname r + cannotFindModule dflags modname r mods <- mapM find_it strs |