diff options
| author | Sylvain Henry <sylvain@haskus.fr> | 2020-04-11 17:03:18 +0200 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2020-04-30 01:56:56 -0400 |
| commit | 8bfb0219587b969d5c8f723c46d433e9493958b4 (patch) | |
| tree | 7ed243039324e5a85905985589d7defd91543625 /ghc | |
| parent | 10d15f1ec4bab4dd6152d87fc66e61658a705eb3 (diff) | |
| download | haskell-8bfb0219587b969d5c8f723c46d433e9493958b4.tar.gz | |
Unit: split and rename modules
Introduce GHC.Unit.* hierarchy for everything concerning units, packages
and modules.
Update Haddock submodule
Diffstat (limited to 'ghc')
| -rw-r--r-- | ghc/GHCi/UI.hs | 6 | ||||
| -rw-r--r-- | ghc/GHCi/UI/Monad.hs | 2 | ||||
| -rw-r--r-- | ghc/Main.hs | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/ghc/GHCi/UI.hs b/ghc/GHCi/UI.hs index 3006af68c1..4eafcbd1d1 100644 --- a/ghc/GHCi/UI.hs +++ b/ghc/GHCi/UI.hs @@ -55,9 +55,9 @@ import GHC.Hs import GHC.Driver.Types ( tyThingParent_maybe, handleFlagWarnings, getSafeMode, hsc_IC, setInteractivePrintName, hsc_dflags, msObjFilePath, runInteractiveHsc, hsc_dynLinker, hsc_interp ) -import GHC.Types.Module +import GHC.Unit.Module import GHC.Types.Name -import GHC.Driver.Packages ( unitIsTrusted, unsafeGetUnitInfo, getInstalledPackageDetails, +import GHC.Unit.State ( unitIsTrusted, unsafeGetUnitInfo, getInstalledPackageDetails, listVisibleModuleNames, pprFlag ) import GHC.Iface.Syntax ( showToHeader ) import GHC.Core.Ppr.TyThing @@ -3150,7 +3150,7 @@ If we don't filter the bindings returned by the function GHC.getBindings, then the :show bindings command will also show unwanted bound names, internally generated by GHC, eg: $tcFoo :: GHC.Types.TyCon = _ - $trModule :: GHC.Types.Module = _ . + $trModule :: GHC.Unit.Module = _ . The filter was introduced as a fix for #12525 [1]. Comment:1 [2] to this ticket contains an analysis of the situation and suggests the solution diff --git a/ghc/GHCi/UI/Monad.hs b/ghc/GHCi/UI/Monad.hs index fb6d673fff..fe8b9380de 100644 --- a/ghc/GHCi/UI/Monad.hs +++ b/ghc/GHCi/UI/Monad.hs @@ -45,7 +45,7 @@ import GHC.Driver.Session import GHC.Data.FastString import GHC.Driver.Types import GHC.Types.SrcLoc -import GHC.Types.Module +import GHC.Unit import GHC.Types.Name.Reader as RdrName (mkOrig) import GHC.Builtin.Names (gHC_GHCI_HELPERS) import GHC.Runtime.Interpreter diff --git a/ghc/Main.hs b/ghc/Main.hs index a4cd897ab4..5e194369ca 100644 --- a/ghc/Main.hs +++ b/ghc/Main.hs @@ -39,7 +39,7 @@ import GHC.Driver.Plugins #if defined(HAVE_INTERNAL_INTERPRETER) import GHC.Runtime.Loader ( initializePlugins ) #endif -import GHC.Types.Module ( ModuleName, mkModuleName ) +import GHC.Unit.Module ( ModuleName, mkModuleName ) -- Various other random stuff that we need @@ -49,7 +49,7 @@ import GHC.Platform.Host import Config import GHC.Settings.Constants import GHC.Driver.Types -import GHC.Driver.Packages ( pprPackages, pprPackagesSimple ) +import GHC.Unit.State ( pprPackages, pprPackagesSimple ) import GHC.Driver.Phases import GHC.Types.Basic ( failed ) import GHC.Driver.Session hiding (WarnReason(..)) |