summaryrefslogtreecommitdiff
path: root/ghc
diff options
context:
space:
mode:
authorSylvain Henry <sylvain@haskus.fr>2020-03-19 10:28:01 +0100
committerMarge Bot <ben+marge-bot@smart-cactus.org>2020-04-07 18:36:49 -0400
commit255418da5d264fb2758bc70925adb2094f34adc3 (patch)
tree39e3d7f84571e750f2a087c1bc2ab87198e9b147 /ghc
parent3d2991f8b4c1b686323b2c9452ce845a60b8d94c (diff)
downloadhaskell-255418da5d264fb2758bc70925adb2094f34adc3.tar.gz
Modules: type-checker (#13009)
Update Haddock submodule
Diffstat (limited to 'ghc')
-rw-r--r--ghc/GHCi/UI.hs4
-rw-r--r--ghc/GHCi/UI/Info.hs2
-rw-r--r--ghc/Main.hs2
3 files changed, 4 insertions, 4 deletions
diff --git a/ghc/GHCi/UI.hs b/ghc/GHCi/UI.hs
index 2472b80897..87b6f597cd 100644
--- a/ghc/GHCi/UI.hs
+++ b/ghc/GHCi/UI.hs
@@ -1172,7 +1172,7 @@ runStmt input step = do
-- In GHCi, we disable `-fdefer-type-errors`, as well as `-fdefer-type-holes`
-- and `-fdefer-out-of-scope-variables` for **naked expressions**. The
-- declarations and statements are not affected.
- -- See Note [Deferred type errors in GHCi] in typecheck/TcRnDriver.hs
+ -- See Note [Deferred type errors in GHCi] in GHC.Tc.Module
st <- getGHCiState
let source = progname st
let line = line_number st
@@ -2104,7 +2104,7 @@ exceptT :: Applicative m => Either e a -> ExceptT e m a
exceptT = ExceptT . pure
-----------------------------------------------------------------------------
--- | @:type@ command. See also Note [TcRnExprMode] in TcRnDriver.
+-- | @:type@ command. See also Note [TcRnExprMode] in GHC.Tc.Module.
typeOfExpr :: GHC.GhcMonad m => String -> m ()
typeOfExpr str = handleSourceError GHC.printException $ do
diff --git a/ghc/GHCi/UI/Info.hs b/ghc/GHCi/UI/Info.hs
index bf941a208d..f5df1edc38 100644
--- a/ghc/GHCi/UI/Info.hs
+++ b/ghc/GHCi/UI/Info.hs
@@ -41,7 +41,7 @@ import GHC.Types.Name
import GHC.Types.Name.Set
import Outputable
import GHC.Types.SrcLoc
-import TcHsSyn
+import GHC.Tc.Utils.Zonk
import GHC.Types.Var
-- | Info about a module. This information is generated every time a
diff --git a/ghc/Main.hs b/ghc/Main.hs
index 3552133891..4ea0aebd31 100644
--- a/ghc/Main.hs
+++ b/ghc/Main.hs
@@ -67,7 +67,7 @@ import MonadUtils ( liftIO )
-- Imports for --abi-hash
import GHC.Iface.Load ( loadUserInterface )
import GHC.Driver.Finder ( findImportedModule, cannotFindModule )
-import TcRnMonad ( initIfaceCheck )
+import GHC.Tc.Utils.Monad ( initIfaceCheck )
import Binary ( openBinMem, put_ )
import BinFingerprint ( fingerprintBinMem )