Modules: type-checker (#13009)

Update Haddock submodule

44 files changed, 58 insertions, 54 deletions

diff --git a/testsuite/tests/dependent/should_compile/T16344b.hs b/testsuite/tests/dependent/should_compile/T16344b.hs
index 1f6fa8a00e..6b48921834 100644
--- a/testsuite/tests/dependent/should_compile/T16344b.hs
+++ b/testsuite/tests/dependent/should_compile/T16344b.hs
@@ -5,6 +5,6 @@ module T16344 where
 import Data.Kind
 
 -- This one is accepted, even though it is polymorphic-recursive.
--- See Note [No polymorphic recursion] in TcHsType
+-- See Note [No polymorphic recursion] in GHC.Tc.Gen.HsType
 
 data T3 ka (a::ka) = forall b. MkT3 (T3 Type b)
diff --git a/testsuite/tests/dependent/should_fail/T16344a.hs b/testsuite/tests/dependent/should_fail/T16344a.hs
index cb4d1a7f21..cfc3091a04 100644
--- a/testsuite/tests/dependent/should_fail/T16344a.hs
+++ b/testsuite/tests/dependent/should_fail/T16344a.hs
@@ -6,6 +6,6 @@ import Data.Kind
 
 -- This one is rejected, but in the typechecking phase
 -- which is a bit nasty.
--- See Note [No polymorphic recursion] in TcHsType
+-- See Note [No polymorphic recursion] in GHC.Tc.Gen.HsType
 
 data T2 ka (a::ka) = MkT2 (T2 Type a)
diff --git a/testsuite/tests/deriving/should_compile/deriving-1935.hs b/testsuite/tests/deriving/should_compile/deriving-1935.hs
index add1f73590..d33b21af13 100644
--- a/testsuite/tests/deriving/should_compile/deriving-1935.hs
+++ b/testsuite/tests/deriving/should_compile/deriving-1935.hs
@@ -1,7 +1,7 @@
 {-# OPTIONS_GHC -XDeriveDataTypeable #-}
 
 -- #1935
--- See Note [Superclasses of derived instance] in TcDeriv
+-- See Note [Superclasses of derived instance] in GHC.Tc.Deriv
 
 {-# OPTIONS -fno-warn-redundant-constraints #-}
 
diff --git a/testsuite/tests/deriving/should_compile/drv003.hs b/testsuite/tests/deriving/should_compile/drv003.hs
index 6fdd763f84..13852c2294 100644
--- a/testsuite/tests/deriving/should_compile/drv003.hs
+++ b/testsuite/tests/deriving/should_compile/drv003.hs
@@ -1,6 +1,6 @@
 {-# OPTIONS -fno-warn-redundant-constraints #-}
 
--- !!! This is the example given in TcDeriv
+-- !!! This is the example given in GHC.Tc.Deriv
 --
 module ShouldSucceed where
 
diff --git a/testsuite/tests/deriving/should_compile/drv015.hs b/testsuite/tests/deriving/should_compile/drv015.hs
index f76da45552..ea79179e68 100644
--- a/testsuite/tests/deriving/should_compile/drv015.hs
+++ b/testsuite/tests/deriving/should_compile/drv015.hs
@@ -4,7 +4,7 @@
 --      instance (Show (f a), Show (g a)) => Show (Pair1 f g a)
 -- and that is not Haskell 98.
 --
--- See Note [Exotic derived instance contexts] in TcSimplify.
+-- See Note [Exotic derived instance contexts] in GHC.Tc.Solver.
 -- The rule is simple: the context of a derived instance decl must
 -- contain constraints of form (C tyvar) only, just as H98.
 
diff --git a/testsuite/tests/gadt/gadt9.hs b/testsuite/tests/gadt/gadt9.hs
index ab8d70d07a..849d5a23ad 100644
--- a/testsuite/tests/gadt/gadt9.hs
+++ b/testsuite/tests/gadt/gadt9.hs
@@ -1,7 +1,7 @@
 {-# LANGUAGE GADTs #-}
 
 -- This one requires careful handling in
--- TcUnify.unifyTyConApp, to preserve rigidity.
+-- GHC.Tc.Utils.Unify.unifyTyConApp, to preserve rigidity.
 
 module ShouldCompile where
 
diff --git a/testsuite/tests/ghc-api/T4891/T4891.hs b/testsuite/tests/ghc-api/T4891/T4891.hs
index f612093122..2ee3126642 100644
--- a/testsuite/tests/ghc-api/T4891/T4891.hs
+++ b/testsuite/tests/ghc-api/T4891/T4891.hs
@@ -10,10 +10,10 @@ import GHC.Exts.Heap
 import GHC.Driver.Types
 import GHC.Runtime.Linker
 import GHC.Runtime.Heap.Inspect
-import TcEnv
+import GHC.Tc.Utils.Env
 import GHC.Core.Type
-import TcRnMonad
-import TcType
+import GHC.Tc.Utils.Monad
+import GHC.Tc.Utils.TcType
 import Control.Applicative
 import GHC.Types.Name (getOccString)
 import Unsafe.Coerce
diff --git a/testsuite/tests/ghci/should_run/tc-plugin-ghci/TcPluginGHCi.hs b/testsuite/tests/ghci/should_run/tc-plugin-ghci/TcPluginGHCi.hs
index 9d0ed01491..b16e217acd 100644
--- a/testsuite/tests/ghci/should_run/tc-plugin-ghci/TcPluginGHCi.hs
+++ b/testsuite/tests/ghci/should_run/tc-plugin-ghci/TcPluginGHCi.hs
@@ -1,6 +1,6 @@
 module TcPluginGHCi where
 
-import TcRnMonad ( TcPlugin(..), TcPluginResult(..) )
+import GHC.Tc.Utils.Monad ( TcPlugin(..), TcPluginResult(..) )
 import GHC.Driver.Plugins ( defaultPlugin, Plugin(..), CommandLineOption )
 import Debug.Trace
 
diff --git a/testsuite/tests/indexed-types/should_compile/T2238.hs b/testsuite/tests/indexed-types/should_compile/T2238.hs
index f2407ac623..70b444985b 100644
--- a/testsuite/tests/indexed-types/should_compile/T2238.hs
+++ b/testsuite/tests/indexed-types/should_compile/T2238.hs
@@ -8,7 +8,7 @@
 -- #2238
 -- Notice that class CTF has just one value field, but
 -- it also has an equality predicate. 
--- See Note [Class newtypes and equality predicates] in BuildTyCl
+-- See Note [Class newtypes and equality predicates] in GHC.Tc.TyCl.Build
 
 module Foo where
 
diff --git a/testsuite/tests/indexed-types/should_fail/ExtraTcsUntch.hs b/testsuite/tests/indexed-types/should_fail/ExtraTcsUntch.hs
index 62798fad39..431097454f 100644
--- a/testsuite/tests/indexed-types/should_fail/ExtraTcsUntch.hs
+++ b/testsuite/tests/indexed-types/should_fail/ExtraTcsUntch.hs
@@ -27,7 +27,7 @@ f x =
     in (g1 '3', g2 undefined)
 
 
-{- This example comes from Note [Extra TcS Untouchables] in TcSimplify. It demonstrates
+{- This example comes from Note [Extra TcS Untouchables] in GHC.Tc.Solver. It demonstrates
    why when floating equalities out of an implication constraint we must record the free
    variables of the equalities as untouchables. With GHC 7.4.1 this program gives a Core
    Lint error because of an existential escaping.
diff --git a/testsuite/tests/package/package07e.stderr b/testsuite/tests/package/package07e.stderr
index 52046fc9bf..6ee827d1bc 100644
--- a/testsuite/tests/package/package07e.stderr
+++ b/testsuite/tests/package/package07e.stderr
@@ -1,26 +1,28 @@
 
 package07e.hs:2:1: error:
     Could not find module ‘GHC.Hs.MyTypes’
-    Perhaps you meant GHC.Hs.Types (needs flag -package-key ghc-8.7)
+    Perhaps you meant
+      GHC.Hs.Types (needs flag -package-key ghc-8.11.0.20200401)
+      GHC.Tc.Types (needs flag -package-key ghc-8.11.0.20200401)
     Use -v (or `:set -v` in ghci) to see a list of the files searched for.
 
 package07e.hs:3:1: error:
     Could not load module ‘GHC.Hs.Types’
-    It is a member of the hidden package ‘ghc-8.7’.
+    It is a member of the hidden package ‘ghc-8.11.0.20200401’.
     You can run ‘:set -package ghc’ to expose it.
     (Note: this unloads all the modules in the current scope.)
     Use -v (or `:set -v` in ghci) to see a list of the files searched for.
 
 package07e.hs:4:1: error:
     Could not load module ‘GHC.Hs.Utils’
-    It is a member of the hidden package ‘ghc-8.7’.
+    It is a member of the hidden package ‘ghc-8.11.0.20200401’.
     You can run ‘:set -package ghc’ to expose it.
     (Note: this unloads all the modules in the current scope.)
     Use -v (or `:set -v` in ghci) to see a list of the files searched for.
 
 package07e.hs:5:1: error:
     Could not load module ‘GHC.Types.Unique.FM’
-    It is a member of the hidden package ‘ghc-8.7’.
+    It is a member of the hidden package ‘ghc-8.11.0.20200401’.
     You can run ‘:set -package ghc’ to expose it.
     (Note: this unloads all the modules in the current scope.)
     Use -v (or `:set -v` in ghci) to see a list of the files searched for.
diff --git a/testsuite/tests/package/package08e.stderr b/testsuite/tests/package/package08e.stderr
index 1c2191be31..9e56961941 100644
--- a/testsuite/tests/package/package08e.stderr
+++ b/testsuite/tests/package/package08e.stderr
@@ -1,26 +1,28 @@
 
 package08e.hs:2:1: error:
     Could not find module ‘GHC.Hs.MyTypes’
-    Perhaps you meant GHC.Hs.Types (needs flag -package-key ghc-8.7)
+    Perhaps you meant
+      GHC.Hs.Types (needs flag -package-key ghc-8.11.0.20200401)
+      GHC.Tc.Types (needs flag -package-key ghc-8.11.0.20200401)
     Use -v (or `:set -v` in ghci) to see a list of the files searched for.
 
 package08e.hs:3:1: error:
     Could not load module ‘GHC.Hs.Types’
-    It is a member of the hidden package ‘ghc-8.7’.
+    It is a member of the hidden package ‘ghc-8.11.0.20200401’.
     You can run ‘:set -package ghc’ to expose it.
     (Note: this unloads all the modules in the current scope.)
     Use -v (or `:set -v` in ghci) to see a list of the files searched for.
 
 package08e.hs:4:1: error:
     Could not load module ‘GHC.Hs.Utils’
-    It is a member of the hidden package ‘ghc-8.7’.
+    It is a member of the hidden package ‘ghc-8.11.0.20200401’.
     You can run ‘:set -package ghc’ to expose it.
     (Note: this unloads all the modules in the current scope.)
     Use -v (or `:set -v` in ghci) to see a list of the files searched for.
 
 package08e.hs:5:1: error:
     Could not load module ‘GHC.Types.Unique.FM’
-    It is a member of the hidden package ‘ghc-8.7’.
+    It is a member of the hidden package ‘ghc-8.11.0.20200401’.
     You can run ‘:set -package ghc’ to expose it.
     (Note: this unloads all the modules in the current scope.)
     Use -v (or `:set -v` in ghci) to see a list of the files searched for.
diff --git a/testsuite/tests/plugins/hole-fit-plugin/HoleFitPlugin.hs b/testsuite/tests/plugins/hole-fit-plugin/HoleFitPlugin.hs
index 054df8af3c..168110623e 100644
--- a/testsuite/tests/plugins/hole-fit-plugin/HoleFitPlugin.hs
+++ b/testsuite/tests/plugins/hole-fit-plugin/HoleFitPlugin.hs
@@ -3,13 +3,13 @@ module HoleFitPlugin where
 
 import GHC.Plugins hiding ((<>))
 
-import TcHoleErrors
+import GHC.Tc.Errors.Hole
 
 import Data.List (stripPrefix, sortOn)
 
-import Constraint
+import GHC.Tc.Types.Constraint
 
-import TcRnMonad
+import GHC.Tc.Utils.Monad
 
 import Text.Read
 
diff --git a/testsuite/tests/plugins/hooks-plugin/Hooks/Plugin.hs b/testsuite/tests/plugins/hooks-plugin/Hooks/Plugin.hs
index 1e047eea7e..a74ac8cac3 100644
--- a/testsuite/tests/plugins/hooks-plugin/Hooks/Plugin.hs
+++ b/testsuite/tests/plugins/hooks-plugin/Hooks/Plugin.hs
@@ -7,7 +7,7 @@ import GHC.Hs.Expr
 import GHC.Hs.Extension
 import GHC.Hs.Lit
 import GHC.Driver.Hooks
-import TcRnMonad
+import GHC.Tc.Utils.Monad
 
 plugin :: Plugin
 plugin = defaultPlugin { dynflagsPlugin = hooksP }
diff --git a/testsuite/tests/plugins/simple-plugin/Simple/RemovePlugin.hs b/testsuite/tests/plugins/simple-plugin/Simple/RemovePlugin.hs
index 2d1c2f7eba..8ee017e61b 100644
--- a/testsuite/tests/plugins/simple-plugin/Simple/RemovePlugin.hs
+++ b/testsuite/tests/plugins/simple-plugin/Simple/RemovePlugin.hs
@@ -6,7 +6,7 @@ import Data.List (intercalate)
 import GHC.Driver.Plugins
 import Bag
 import GHC.Driver.Types
-import TcRnTypes
+import GHC.Tc.Types
 import GHC.Hs.Extension
 import GHC.Hs.Expr
 import Outputable
diff --git a/testsuite/tests/plugins/simple-plugin/Simple/SourcePlugin.hs b/testsuite/tests/plugins/simple-plugin/Simple/SourcePlugin.hs
index d58c69f375..36ea230281 100644
--- a/testsuite/tests/plugins/simple-plugin/Simple/SourcePlugin.hs
+++ b/testsuite/tests/plugins/simple-plugin/Simple/SourcePlugin.hs
@@ -5,7 +5,7 @@ import Data.List (intercalate)
 import Data.Maybe (isJust)
 import GHC.Driver.Plugins
 import GHC.Driver.Types
-import TcRnTypes
+import GHC.Tc.Types
 import GHC.Hs.Extension
 import GHC.Types.Avail
 import GHC.Hs.Expr
diff --git a/testsuite/tests/plugins/simple-plugin/Simple/TrustworthyPlugin.hs b/testsuite/tests/plugins/simple-plugin/Simple/TrustworthyPlugin.hs
index fb5df22e7d..ecf509e40e 100644
--- a/testsuite/tests/plugins/simple-plugin/Simple/TrustworthyPlugin.hs
+++ b/testsuite/tests/plugins/simple-plugin/Simple/TrustworthyPlugin.hs
@@ -1,7 +1,7 @@
 module Simple.TrustworthyPlugin (plugin) where
 
 import GHC.Plugins
-import TcRnMonad
+import GHC.Tc.Utils.Monad
 
 plugin :: Plugin
 plugin = defaultPlugin
diff --git a/testsuite/tests/plugins/static-plugins.hs b/testsuite/tests/plugins/static-plugins.hs
index 3a0f3dfb08..77a5280bef 100644
--- a/testsuite/tests/plugins/static-plugins.hs
+++ b/testsuite/tests/plugins/static-plugins.hs
@@ -15,7 +15,7 @@ import GHC.Driver.Types
 import Outputable
 import GHC.Driver.Plugins
 import System.Environment
-import TcRnTypes
+import GHC.Tc.Types
 
 import Simple.SourcePlugin (plugin)
 
diff --git a/testsuite/tests/pmcheck/should_compile/T11195.hs b/testsuite/tests/pmcheck/should_compile/T11195.hs
index ff3e5ae6fa..57e2b44276 100644
--- a/testsuite/tests/pmcheck/should_compile/T11195.hs
+++ b/testsuite/tests/pmcheck/should_compile/T11195.hs
@@ -7,7 +7,7 @@ import GHC.Core.Coercion
 import GHC.Core.Type hiding( substTyVarBndr, substTy, extendTCvSubst )
 import GHC.Core.InstEnv
 import GHC.Core.Coercion.Axiom
-import TcType       ( exactTyCoVarsOfType )
+import GHC.Tc.Utils.TcType       ( exactTyCoVarsOfType )
 import GHC.Types.Var.Set
 import GHC.Types.Var.Env
 import Pair
diff --git a/testsuite/tests/polykinds/CuskFam.hs b/testsuite/tests/polykinds/CuskFam.hs
index c339dbcac0..da31a6acda 100644
--- a/testsuite/tests/polykinds/CuskFam.hs
+++ b/testsuite/tests/polykinds/CuskFam.hs
@@ -13,4 +13,4 @@ type family X :: F a
     --      The type variable ‘a1’ is ambiguous
     --    • In the type family declaration for ‘X’
     --
-    -- See Note [Unifying implicit CUSK variables] in TcHsType
+    -- See Note [Unifying implicit CUSK variables] in GHC.Tc.Gen.HsType
diff --git a/testsuite/tests/polykinds/TyVarTvKinds.hs b/testsuite/tests/polykinds/TyVarTvKinds.hs
index a3a0de3da4..cdfe115655 100644
--- a/testsuite/tests/polykinds/TyVarTvKinds.hs
+++ b/testsuite/tests/polykinds/TyVarTvKinds.hs
@@ -4,4 +4,4 @@ module TyVarTvKinds where
 
 data T (a :: k1) x = MkT (S a ())
 data S (b :: k2) y = MkS (T b ())
-  -- tests TcTyClsDecls.no_sig_tv
+  -- tests GHC.Tc.TyCl.no_sig_tv
diff --git a/testsuite/tests/programs/record_upd/Main.hs b/testsuite/tests/programs/record_upd/Main.hs
index 0fd8e80ab6..da4aec7356 100644
--- a/testsuite/tests/programs/record_upd/Main.hs
+++ b/testsuite/tests/programs/record_upd/Main.hs
@@ -1,6 +1,6 @@
 {-      The purpose of this is to test that record update is
         sufficiently polymorphic.  See comments with
-        tcExpr (RecordUpd) in TcExpr.lhs
+        tcExpr (RecordUpd) in GHC.Tc.Gen.Expr
 -}
 
 module Main where
diff --git a/testsuite/tests/roles/should_compile/Roles2.hs b/testsuite/tests/roles/should_compile/Roles2.hs
index 1ead5a4e94..eb6dc38f8c 100644
--- a/testsuite/tests/roles/should_compile/Roles2.hs
+++ b/testsuite/tests/roles/should_compile/Roles2.hs
@@ -3,7 +3,7 @@ module Roles2 where
 import GHC.Ptr
 
 -- these *must* have certain roles, or things break strangely
--- see TcForeign
+-- see GHC.Tc.Gen.Foreign
 
 data T1 a = K1 (IO a)
 data T2 a = K2 (FunPtr a)
diff --git a/testsuite/tests/simplCore/should_compile/T5776.hs b/testsuite/tests/simplCore/should_compile/T5776.hs
index 17a3e25852..5fab2b4ceb 100644
--- a/testsuite/tests/simplCore/should_compile/T5776.hs
+++ b/testsuite/tests/simplCore/should_compile/T5776.hs
@@ -13,7 +13,7 @@ module T5776 where
 --      = GHC.Types.True
 --
 -- Note the *two* forall'd dEq parameters. This is important.
--- See Note [Simplifying RULE lhs constraints] in TcSimplify
+-- See Note [Simplifying RULE lhs constraints] in GHC.Tc.Solver
 
 {-# RULES "foo" forall x y z.
       f (g x y) (g y z) = True
diff --git a/testsuite/tests/typecheck/should_compile/DfltProb2.hs b/testsuite/tests/typecheck/should_compile/DfltProb2.hs
index 8553ca4c70..2dc6000f2b 100644
--- a/testsuite/tests/typecheck/should_compile/DfltProb2.hs
+++ b/testsuite/tests/typecheck/should_compile/DfltProb2.hs
@@ -18,6 +18,6 @@ f x = const True (\y -> let w :: a -> a
      (ii) /then/ we try to default (and succeed)
      (iii) then try to resolve again
  
-   See Note [Top-level Defaulting Plan] in TcSimplify -}
+   See Note [Top-level Defaulting Plan] in GHC.Tc.Solver -}
 
 
diff --git a/testsuite/tests/typecheck/should_compile/Improvement.hs b/testsuite/tests/typecheck/should_compile/Improvement.hs
index b7bda66813..3e15139853 100644
--- a/testsuite/tests/typecheck/should_compile/Improvement.hs
+++ b/testsuite/tests/typecheck/should_compile/Improvement.hs
@@ -8,7 +8,7 @@
 -- overkill.
 --
 -- See Note Note [No reduction for Derived class constraints]
--- in TcInteract
+-- in GHC.Tc.Solver.Interact
 
 module Foo where
 
diff --git a/testsuite/tests/typecheck/should_compile/T11462_Plugin.hs b/testsuite/tests/typecheck/should_compile/T11462_Plugin.hs
index bc57d16089..2f0297cf2d 100644
--- a/testsuite/tests/typecheck/should_compile/T11462_Plugin.hs
+++ b/testsuite/tests/typecheck/should_compile/T11462_Plugin.hs
@@ -1,6 +1,6 @@
 module T11462_Plugin(plugin) where
 
-import TcRnMonad ( TcPlugin(..), TcPluginResult(..) )
+import GHC.Tc.Utils.Monad ( TcPlugin(..), TcPluginResult(..) )
 import GHC.Driver.Plugins ( defaultPlugin, Plugin(..), CommandLineOption )
 
 plugin :: Plugin
diff --git a/testsuite/tests/typecheck/should_compile/T11525_Plugin.hs b/testsuite/tests/typecheck/should_compile/T11525_Plugin.hs
index 5133b87b7f..206c3c2a8f 100644
--- a/testsuite/tests/typecheck/should_compile/T11525_Plugin.hs
+++ b/testsuite/tests/typecheck/should_compile/T11525_Plugin.hs
@@ -1,6 +1,6 @@
 module T11525_Plugin(plugin) where
 
-import TcRnMonad ( TcPlugin(..), TcPluginResult(..) )
+import GHC.Tc.Utils.Monad ( TcPlugin(..), TcPluginResult(..) )
 import GHC.Driver.Plugins ( defaultPlugin, Plugin(..), CommandLineOption )
 
 plugin :: Plugin
diff --git a/testsuite/tests/typecheck/should_compile/tc079.hs b/testsuite/tests/typecheck/should_compile/tc079.hs
index 6784df6024..0aa9015f52 100644
--- a/testsuite/tests/typecheck/should_compile/tc079.hs
+++ b/testsuite/tests/typecheck/should_compile/tc079.hs
@@ -2,7 +2,7 @@
 
 -- !!! small class decl with local polymorphism;
 -- !!! "easy" to check default methods and such...
--- !!! (this is the example given in TcClassDcl)
+-- !!! (this is the example given in GHC.Tc.TyCl.Class)
 --
 module ShouldSucceed where
 
diff --git a/testsuite/tests/typecheck/should_compile/tc101.hs b/testsuite/tests/typecheck/should_compile/tc101.hs
index 7ae95d53f5..d2c7958fac 100644
--- a/testsuite/tests/typecheck/should_compile/tc101.hs
+++ b/testsuite/tests/typecheck/should_compile/tc101.hs
@@ -4,7 +4,7 @@
 module ShouldCompile where
 
 -- This made the compiler (4.04 proto) loop (stack overflow)
--- The bug was in TcUnify.uUnboundVar and is documented there.
+-- The bug was in GHC.Tc.Utils.Unify.uUnboundVar and is documented there.
 
 type A a = ()
 
diff --git a/testsuite/tests/typecheck/should_compile/tc129.hs b/testsuite/tests/typecheck/should_compile/tc129.hs
index 56163ffe31..abbd1f259c 100644
--- a/testsuite/tests/typecheck/should_compile/tc129.hs
+++ b/testsuite/tests/typecheck/should_compile/tc129.hs
@@ -4,7 +4,7 @@
 -- GHC 5.00.2 fails this test
 
 -- The thing is to do with whether an implicit parameter
--- constraint can be "inherited".  See notes in TcSimplify.lhs
+-- constraint can be "inherited".  See notes in GHC.Tc.Solver
 
 module ShouldCompile where
 
diff --git a/testsuite/tests/typecheck/should_compile/tc157.hs b/testsuite/tests/typecheck/should_compile/tc157.hs
index 4baebab5fc..57c1b99ae8 100644
--- a/testsuite/tests/typecheck/should_compile/tc157.hs
+++ b/testsuite/tests/typecheck/should_compile/tc157.hs
@@ -16,4 +16,4 @@ bar = foo (\t -> t + t)
 -- the arg to foo.  But it might because it's Num (C u a)!
 
 -- This test tickles a bizarre corner case documented
--- as [Silly Type Synonym] in TcMType.lhs
+-- as [Silly Type Synonym] in GHC.Tc.Utils.TcMType
diff --git a/testsuite/tests/typecheck/should_compile/tc161.hs b/testsuite/tests/typecheck/should_compile/tc161.hs
index a247e2b1be..342cc6d5d4 100644
--- a/testsuite/tests/typecheck/should_compile/tc161.hs
+++ b/testsuite/tests/typecheck/should_compile/tc161.hs
@@ -7,7 +7,7 @@
 --    In the application `GHC.Err.noMethodBindingError "Foo.hs:7|Foo.foo"#'
 --
 -- Fix is to give wild-card args to the default methods
--- See TcClassDcl.mkDefMethRhs
+-- See GHC.Tc.TyCl.Class.mkDefMethRhs
 
 module ShouldCompile where
 
diff --git a/testsuite/tests/typecheck/should_compile/tc176.hs b/testsuite/tests/typecheck/should_compile/tc176.hs
index d41cbb564e..ebfe7a405a 100644
--- a/testsuite/tests/typecheck/should_compile/tc176.hs
+++ b/testsuite/tests/typecheck/should_compile/tc176.hs
@@ -20,7 +20,7 @@
 
 -- Sept 08: on further reflection (!) I'm changing it back
 -- See Note [Subtle interaction of recursion and overlap]
--- in TcInstDcls
+-- in GHC.Tc.TyCl.Instance
 
 module ShouldCompile  where
 
diff --git a/testsuite/tests/typecheck/should_compile/tc178.hs b/testsuite/tests/typecheck/should_compile/tc178.hs
index d8904c12db..c676a2f7eb 100644
--- a/testsuite/tests/typecheck/should_compile/tc178.hs
+++ b/testsuite/tests/typecheck/should_compile/tc178.hs
@@ -1,7 +1,7 @@
 {-# OPTIONS_GHC -fno-warn-redundant-constraints #-}
 {-# LANGUAGE FlexibleInstances #-}
 
--- This one tickled the kind-check in TcType.matchTys,
+-- This one tickled the kind-check in GHC.Tc.Utils.TcType.matchTys,
 -- which should use sub-kinding
 
 module ShouldCompile where
diff --git a/testsuite/tests/typecheck/should_compile/tc200.hs b/testsuite/tests/typecheck/should_compile/tc200.hs
index ef799c61d1..43eb0947c0 100644
--- a/testsuite/tests/typecheck/should_compile/tc200.hs
+++ b/testsuite/tests/typecheck/should_compile/tc200.hs
@@ -2,7 +2,7 @@
 {-# LANGUAGE ConstrainedClassMethods #-}  -- Needed for 'baz'
 
 -- A nasty case that crashed GHC 6.4 with a Lint error; 
--- see Note [Multiple instantiation] in TcExpr
+-- see Note [Multiple instantiation] in GHC.Tc.Gen.Expr
 
 module ShouldCompile where
 
diff --git a/testsuite/tests/typecheck/should_compile/tc228.hs b/testsuite/tests/typecheck/should_compile/tc228.hs
index 7989674847..67703a2a91 100644
--- a/testsuite/tests/typecheck/should_compile/tc228.hs
+++ b/testsuite/tests/typecheck/should_compile/tc228.hs
@@ -6,7 +6,7 @@
 -- Reason: we get an implication constraint (forall a. Typeable a => Typeable b),
 -- when generalising unExTypeable.  We want to infer a context for the 
 -- whole thing of (Typeable b).
--- See Note [Inference and implication constraints] in TcSimplify
+-- See Note [Inference and implication constraints] in GHC.Tc.Solver
 
 
 module Foo where
diff --git a/testsuite/tests/typecheck/should_compile/tc231.hs b/testsuite/tests/typecheck/should_compile/tc231.hs
index 9d0fc8316b..a00f17cf83 100644
--- a/testsuite/tests/typecheck/should_compile/tc231.hs
+++ b/testsuite/tests/typecheck/should_compile/tc231.hs
@@ -8,7 +8,7 @@
 --         => Q s (Z [Char]) t1 -> ST s ()
 
 -- Note the quantification over 'b', which was previously
--- omitted; see Note [Important subtlety in oclose] in FunDeps
+-- omitted; see Note [Important subtlety in oclose] in GHC.Tc.Instance.FunDeps
 
 
 module ShouldCompile where
diff --git a/testsuite/tests/typecheck/should_fail/T16512b.hs b/testsuite/tests/typecheck/should_fail/T16512b.hs
index ad2a824224..68820c252b 100644
--- a/testsuite/tests/typecheck/should_fail/T16512b.hs
+++ b/testsuite/tests/typecheck/should_fail/T16512b.hs
@@ -6,4 +6,4 @@ type family G a = r | r -> a where
   G [a] = [G a]
 
 -- this needs -XUndecidableInstances.
--- See Note [Coverage condition for injective type families] in FamInst
+-- See Note [Coverage condition for injective type families] in GHC.Tc.Instance.Family
diff --git a/testsuite/tests/typecheck/should_fail/tcfail093.hs b/testsuite/tests/typecheck/should_fail/tcfail093.hs
index 6e2e6781ba..2329bfa2ff 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail093.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail093.hs
@@ -10,7 +10,7 @@ module ShouldFail where
 -- Reported by Thomas Hallgren Nov 00
 
 -- July 07: I'm changing this from "should fail" to "should succeed"
--- See Note [Important subtlety in oclose] in FunDeps
+-- See Note [Important subtlety in oclose] in GHC.Tc.Instance.FunDeps
 
 
 primDup :: Int -> IO Int
diff --git a/testsuite/tests/typecheck/should_fail/tcfail098.hs b/testsuite/tests/typecheck/should_fail/tcfail098.hs
index 6c06b898e0..159e9c8081 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail098.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail098.hs
@@ -6,7 +6,7 @@ module ShouldFail where
 -- is ambiguous, but we have UndecidableInstances on, so
 -- it could conceivably be ok (we'd need OverlappingInstances
 -- too in this case).  So we allow it.
--- See Note [The ambiguity check for type signatures] in TcMType
+-- See Note [The ambiguity check for type signatures] in GHC.Tc.Utils.TcMType
 
 class Bar a
 instance Bar a => Bar Bool
diff --git a/testsuite/tests/typecheck/should_fail/tcfail133.hs b/testsuite/tests/typecheck/should_fail/tcfail133.hs
index af45be93cd..da58021700 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail133.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail133.hs
@@ -1,7 +1,7 @@
 {-# LANGUAGE UndecidableInstances, FlexibleInstances, TypeOperators,
              MultiParamTypeClasses, FunctionalDependencies, DatatypeContexts #-}
 
--- This one crashed GHC 6.3 due to an error in TcSimplify.add_ors
+-- This one crashed GHC 6.3 due to an error in GHC.Tc.Solver.add_ors
 
 module Foo where
 
diff --git a/testsuite/tests/typecheck/should_fail/tcfail142.hs b/testsuite/tests/typecheck/should_fail/tcfail142.hs
index add92e43ab..a628b0e335 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail142.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail142.hs
@@ -1,7 +1,7 @@
 {-# LANGUAGE MultiParamTypeClasses #-}
 
 -- Tests top-level ambiguity resolution
--- This made a post-6.4 GHC fall over in TcSimplify
+-- This made a post-6.4 GHC fall over in GHC.Tc.Solver
 
 module ShouldFail where 
 
diff --git a/testsuite/tests/typecheck/should_run/tcrun021.hs b/testsuite/tests/typecheck/should_run/tcrun021.hs
index b9bda74c0c..4a80ed1bb0 100644
--- a/testsuite/tests/typecheck/should_run/tcrun021.hs
+++ b/testsuite/tests/typecheck/should_run/tcrun021.hs
@@ -1,7 +1,7 @@
 {-# LANGUAGE MultiParamTypeClasses, FunctionalDependencies,
              TypeSynonymInstances, FlexibleInstances #-}
 
--- This bizarre program failed because TcSimplify built a loop of
+-- This bizarre program failed because GHC.Tc.Solver built a loop of
 -- dictionaries, due to an obscure bug in the way in which superclasses
 -- were added