Brandon Chinn pushed to branch wip/T21730-import at Glasgow Haskell Compiler / GHC

Commits:

2 changed files:

Changes:

  • compiler/GHC/Driver/Session/Inspect.hs
    ... ... @@ -132,8 +132,7 @@ availsToGlobalRdrEnv hsc_env mod avails
    132 132
           -- all the specified modules into the global interactive module
    
    133 133
         imp_spec = ImpSpec { is_decl = decl, is_item = ImpAll}
    
    134 134
         decl = ImpDeclSpec { is_mod = mod, is_as = moduleName mod,
    
    135
    -                         is_qual = False,
    
    136
    -                         is_isboot = NotBoot, is_pkg_qual = NoPkgQual,
    
    135
    +                         is_qual = False, is_isboot = NotBoot, is_pkg_qual = NoPkgQual,
    
    137 136
                              is_dloc = srcLocSpan interactiveSrcLoc,
    
    138 137
                              is_level = NormalLevel }
    
    139 138
     
    

  • compiler/GHC/Runtime/Loader.hs
    ... ... @@ -354,8 +354,7 @@ lookupRdrNameInModuleForPlugins hsc_env mod_name rdr_name = do
    354 354
                     Just iface -> do
    
    355 355
                         -- Try and find the required name in the exports
    
    356 356
                         let decl_spec = ImpDeclSpec { is_mod = mod, is_as = mod_name, is_pkg_qual = NoPkgQual
    
    357
    -                                                , is_qual = False
    
    358
    -                                                , is_dloc = noSrcSpan, is_isboot = NotBoot, is_level = SpliceLevel }
    
    357
    +                                                , is_qual = False, is_dloc = noSrcSpan, is_isboot = NotBoot, is_level = SpliceLevel }
    
    359 358
                             imp_spec = ImpSpec decl_spec ImpAll
    
    360 359
                             env = mkGlobalRdrEnv
    
    361 360
                                 $ gresFromAvails hsc_env (Just imp_spec) (mi_exports iface)