summaryrefslogtreecommitdiff
path: root/ghc
diff options
context:
space:
mode:
authorSylvain Henry <sylvain@haskus.fr>2020-04-05 17:39:13 +0200
committerSylvain Henry <sylvain@haskus.fr>2020-04-18 20:04:46 +0200
commit15312bbb53f247c9ed2c5cf75100a9f44c1c7227 (patch)
tree8306dcc04a5b7c82464f903044dfdd589e7fdcd7 /ghc
parent3ca52151881451ce5b3a7740d003e811b586140d (diff)
downloadhaskell-15312bbb53f247c9ed2c5cf75100a9f44c1c7227.tar.gz
Modules (#13009)
* SysTools * Parser * GHC.Builtin * GHC.Iface.Recomp * Settings Update Haddock submodule Metric Decrease: Naperian parsing001
Diffstat (limited to 'ghc')
-rw-r--r--ghc/GHCi/UI.hs4
-rw-r--r--ghc/GHCi/UI/Monad.hs2
-rw-r--r--ghc/Main.hs8
3 files changed, 7 insertions, 7 deletions
diff --git a/ghc/GHCi/UI.hs b/ghc/GHCi/UI.hs
index 87b6f597cd..be3c75f556 100644
--- a/ghc/GHCi/UI.hs
+++ b/ghc/GHCi/UI.hs
@@ -61,10 +61,10 @@ import GHC.Driver.Packages ( trusted, getPackageDetails, getInstalledPackageDeta
listVisibleModuleNames, pprFlag )
import GHC.Iface.Syntax ( showToHeader )
import GHC.Core.Ppr.TyThing
-import PrelNames
+import GHC.Builtin.Names
import GHC.Types.Name.Reader as RdrName ( getGRE_NameQualifier_maybes, getRdrName )
import GHC.Types.SrcLoc as SrcLoc
-import qualified Lexer
+import qualified GHC.Parser.Lexer as Lexer
import StringBuffer
import Outputable hiding ( printForUser, printForUserPartWay )
diff --git a/ghc/GHCi/UI/Monad.hs b/ghc/GHCi/UI/Monad.hs
index 94d5b8bf91..27e31b6cf6 100644
--- a/ghc/GHCi/UI/Monad.hs
+++ b/ghc/GHCi/UI/Monad.hs
@@ -47,7 +47,7 @@ import GHC.Driver.Types
import GHC.Types.SrcLoc
import GHC.Types.Module
import GHC.Types.Name.Reader as RdrName (mkOrig)
-import PrelNames (gHC_GHCI_HELPERS)
+import GHC.Builtin.Names (gHC_GHCI_HELPERS)
import GHC.Runtime.Interpreter
import GHCi.RemoteTypes
import GHC.Hs (ImportDecl, GhcPs, GhciLStmt, LHsDecl)
diff --git a/ghc/Main.hs b/ghc/Main.hs
index 4ea0aebd31..7a356b920a 100644
--- a/ghc/Main.hs
+++ b/ghc/Main.hs
@@ -47,7 +47,7 @@ import GHC.HandleEncoding
import GHC.Platform
import GHC.Platform.Host
import Config
-import Constants
+import GHC.Settings.Constants
import GHC.Driver.Types
import GHC.Driver.Packages ( pprPackages, pprPackagesSimple )
import GHC.Driver.Phases
@@ -56,8 +56,8 @@ import GHC.Driver.Session hiding (WarnReason(..))
import ErrUtils
import FastString
import Outputable
-import SysTools.BaseDir
-import SysTools.Settings
+import GHC.SysTools.BaseDir
+import GHC.Settings.IO
import GHC.Types.SrcLoc
import Util
import Panic
@@ -69,7 +69,7 @@ import GHC.Iface.Load ( loadUserInterface )
import GHC.Driver.Finder ( findImportedModule, cannotFindModule )
import GHC.Tc.Utils.Monad ( initIfaceCheck )
import Binary ( openBinMem, put_ )
-import BinFingerprint ( fingerprintBinMem )
+import GHC.Iface.Recomp.Binary ( fingerprintBinMem )
-- Standard Haskell libraries
import System.IO