diff options
Diffstat (limited to 'compiler/main')
| -rw-r--r-- | compiler/main/DynamicLoading.hs | 2 | ||||
| -rw-r--r-- | compiler/main/HscMain.hs | 7 | ||||
| -rw-r--r-- | compiler/main/HscTypes.hs | 7 |
3 files changed, 9 insertions, 7 deletions
diff --git a/compiler/main/DynamicLoading.hs b/compiler/main/DynamicLoading.hs index 53ae31f8ef..a48f0238be 100644 --- a/compiler/main/DynamicLoading.hs +++ b/compiler/main/DynamicLoading.hs @@ -33,7 +33,7 @@ import RdrName ( RdrName, ImportSpec(..), ImpDeclSpec(..) , ImpItemSpec(..), mkGlobalRdrEnv, lookupGRE_RdrName , gre_name, mkRdrQual ) import OccName ( OccName, mkVarOcc ) -import RnNames ( gresFromAvails ) +import GHC.Rename.Names ( gresFromAvails ) import Plugins import PrelNames ( pluginTyConName, frontendPluginTyConName ) diff --git a/compiler/main/HscMain.hs b/compiler/main/HscMain.hs index 0e0b853c9a..ffb9b3ced9 100644 --- a/compiler/main/HscMain.hs +++ b/compiler/main/HscMain.hs @@ -1017,9 +1017,10 @@ hscCheckSafeImports tcg_env = do -- -- The code for this is quite tricky as the whole algorithm is done in a few -- distinct phases in different parts of the code base. See --- RnNames.rnImportDecl for where package trust dependencies for a module are --- collected and unioned. Specifically see the Note [RnNames . Tracking Trust --- Transitively] and the Note [RnNames . Trust Own Package]. +-- GHC.Rename.Names.rnImportDecl for where package trust dependencies for a +-- module are collected and unioned. Specifically see the Note [Tracking Trust +-- Transitively] in GHC.Rename.Names and the Note [Trust Own Package] in +-- GHC.Rename.Names. checkSafeImports :: TcGblEnv -> Hsc TcGblEnv checkSafeImports tcg_env = do diff --git a/compiler/main/HscTypes.hs b/compiler/main/HscTypes.hs index 85aac8c7c4..6355c5dc95 100644 --- a/compiler/main/HscTypes.hs +++ b/compiler/main/HscTypes.hs @@ -1059,7 +1059,7 @@ data ModIface_ (phase :: ModIfacePhase) -- module is Safe (so doesn't require the package be trusted -- itself) but imports some trustworthy modules from its own -- package (which does require its own package be trusted). - -- See Note [RnNames . Trust Own Package] + -- See Note [Trust Own Package] in GHC.Rename.Names mi_complete_sigs :: [IfaceCompleteMatch], mi_doc_hdr :: Maybe HsDocString, @@ -1433,7 +1433,8 @@ data ModGuts mg_safe_haskell :: SafeHaskellMode, -- ^ Safe Haskell mode mg_trust_pkg :: Bool, -- ^ Do we need to trust our -- own package for Safe Haskell? - -- See Note [RnNames . Trust Own Package] + -- See Note [Trust Own Package] + -- in GHC.Rename.Names mg_doc_hdr :: !(Maybe HsDocString), -- ^ Module header. mg_decl_docs :: !DeclDocMap, -- ^ Docs on declarations. @@ -2467,7 +2468,7 @@ data Dependencies -- or that are in the dep_pkgs of those modules -- The bool indicates if the package is required to be -- trusted when the module is imported as a safe import - -- (Safe Haskell). See Note [RnNames . Tracking Trust Transitively] + -- (Safe Haskell). See Note [Tracking Trust Transitively] in GHC.Rename.Names , dep_orphs :: [Module] -- ^ Transitive closure of orphan modules (whether |