summaryrefslogtreecommitdiff
path: root/compiler/GHC/Hs
diff options
context:
space:
mode:
authorSylvain Henry <sylvain@haskus.fr>2020-03-02 11:43:03 +0100
committerMarge Bot <ben+marge-bot@smart-cactus.org>2020-03-16 23:53:24 -0400
commit18a346a4b5a02b8c62e8eedb91b35c2d8e754b96 (patch)
tree59121ffd5a46c1987a184db3842a3089f6250d11 /compiler/GHC/Hs
parent818b3c38e7548f4720815f76969238d82c9650f7 (diff)
downloadhaskell-18a346a4b5a02b8c62e8eedb91b35c2d8e754b96.tar.gz
Modules: Core (#13009)
Update submodule: haddock
Diffstat (limited to 'compiler/GHC/Hs')
-rw-r--r--compiler/GHC/Hs/Binds.hs2
-rw-r--r--compiler/GHC/Hs/Decls.hs14
-rw-r--r--compiler/GHC/Hs/Dump.hs2
-rw-r--r--compiler/GHC/Hs/Expr.hs4
-rw-r--r--compiler/GHC/Hs/Lit.hs2
-rw-r--r--compiler/GHC/Hs/Pat.hs8
-rw-r--r--compiler/GHC/Hs/Types.hs6
-rw-r--r--compiler/GHC/Hs/Utils.hs8
8 files changed, 23 insertions, 23 deletions
diff --git a/compiler/GHC/Hs/Binds.hs b/compiler/GHC/Hs/Binds.hs
index 3c815821f5..70da7903fc 100644
--- a/compiler/GHC/Hs/Binds.hs
+++ b/compiler/GHC/Hs/Binds.hs
@@ -34,7 +34,7 @@ import GHC.Hs.Extension
import GHC.Hs.Types
import GHC.Core
import TcEvidence
-import Type
+import GHC.Core.Type
import NameSet
import BasicTypes
import Outputable
diff --git a/compiler/GHC/Hs/Decls.hs b/compiler/GHC/Hs/Decls.hs
index b09e0d9eea..84a9bb4dca 100644
--- a/compiler/GHC/Hs/Decls.hs
+++ b/compiler/GHC/Hs/Decls.hs
@@ -103,19 +103,19 @@ import {-# SOURCE #-} GHC.Hs.Expr( HsExpr, HsSplice, pprExpr,
import GHC.Hs.Binds
import GHC.Hs.Types
import GHC.Hs.Doc
-import TyCon
+import GHC.Core.TyCon
import BasicTypes
-import Coercion
+import GHC.Core.Coercion
import ForeignCall
import GHC.Hs.Extension
import NameSet
-- others:
-import Class
+import GHC.Core.Class
import Outputable
import Util
import SrcLoc
-import Type
+import GHC.Core.Type
import Bag
import Maybes
@@ -447,7 +447,7 @@ Default methods
- If there is a default method name at all, it's recorded in
the ClassOpSig (in GHC.Hs.Binds), in the DefMethInfo field.
- (DefMethInfo is defined in Class.hs)
+ (DefMethInfo is defined in GHC.Core.Class)
Source-code class decls and interface-code class decls are treated subtly
differently, which has given me a great deal of confusion over the years.
@@ -631,7 +631,7 @@ The idea is that the associated type is really a top-level decl in its
own right. However we are careful to use the same name 'a', so that
we can match things up.
-c.f. Note [Associated type tyvar names] in Class.hs
+c.f. Note [Associated type tyvar names] in GHC.Core.Class
Note [Family instance declaration binders]
-}
@@ -1057,7 +1057,7 @@ other argument:
Here injectivity annotation would consist of two comma-separated injectivity
conditions.
-See also Note [Injective type families] in TyCon
+See also Note [Injective type families] in GHC.Core.TyCon
-}
-- | Located type Family Result Signature
diff --git a/compiler/GHC/Hs/Dump.hs b/compiler/GHC/Hs/Dump.hs
index 5bdfc8668e..71a951a30a 100644
--- a/compiler/GHC/Hs/Dump.hs
+++ b/compiler/GHC/Hs/Dump.hs
@@ -23,7 +23,7 @@ import BasicTypes
import FastString
import NameSet
import Name
-import DataCon
+import GHC.Core.DataCon
import SrcLoc
import GHC.Hs
import OccName hiding (occName)
diff --git a/compiler/GHC/Hs/Expr.hs b/compiler/GHC/Hs/Expr.hs
index 724087eb96..551401be6c 100644
--- a/compiler/GHC/Hs/Expr.hs
+++ b/compiler/GHC/Hs/Expr.hs
@@ -41,12 +41,12 @@ import GHC.Core
import Name
import NameSet
import BasicTypes
-import ConLike
+import GHC.Core.ConLike
import SrcLoc
import Util
import Outputable
import FastString
-import Type
+import GHC.Core.Type
import TysWiredIn (mkTupleStr)
import TcType (TcType)
import {-# SOURCE #-} TcRnTypes (TcLclEnv)
diff --git a/compiler/GHC/Hs/Lit.hs b/compiler/GHC/Hs/Lit.hs
index dac9f4de93..fa538f3089 100644
--- a/compiler/GHC/Hs/Lit.hs
+++ b/compiler/GHC/Hs/Lit.hs
@@ -25,7 +25,7 @@ import {-# SOURCE #-} GHC.Hs.Expr( HsExpr, pprExpr )
import BasicTypes ( IntegralLit(..),FractionalLit(..),negateIntegralLit,
negateFractionalLit,SourceText(..),pprWithSourceText,
PprPrec(..), topPrec )
-import Type
+import GHC.Core.Type
import Outputable
import FastString
import GHC.Hs.Extension
diff --git a/compiler/GHC/Hs/Pat.hs b/compiler/GHC/Hs/Pat.hs
index 76735b2f97..c427d977ed 100644
--- a/compiler/GHC/Hs/Pat.hs
+++ b/compiler/GHC/Hs/Pat.hs
@@ -61,11 +61,11 @@ import GHC.Core.Ppr ( {- instance OutputableBndr TyVar -} )
import TysWiredIn
import Var
import RdrName ( RdrName )
-import ConLike
-import DataCon
-import TyCon
+import GHC.Core.ConLike
+import GHC.Core.DataCon
+import GHC.Core.TyCon
import Outputable
-import Type
+import GHC.Core.Type
import SrcLoc
import Bag -- collect ev vars from pats
import Maybes
diff --git a/compiler/GHC/Hs/Types.hs b/compiler/GHC/Hs/Types.hs
index d25e25b209..354611836c 100644
--- a/compiler/GHC/Hs/Types.hs
+++ b/compiler/GHC/Hs/Types.hs
@@ -81,10 +81,10 @@ import GHC.Hs.Extension
import Id ( Id )
import Name( Name, NamedThing(getName) )
import RdrName ( RdrName )
-import DataCon( HsSrcBang(..), HsImplBang(..),
- SrcStrictness(..), SrcUnpackedness(..) )
+import GHC.Core.DataCon( HsSrcBang(..), HsImplBang(..),
+ SrcStrictness(..), SrcUnpackedness(..) )
import TysWiredIn( mkTupleStr )
-import Type
+import GHC.Core.Type
import GHC.Hs.Doc
import BasicTypes
import SrcLoc
diff --git a/compiler/GHC/Hs/Utils.hs b/compiler/GHC/Hs/Utils.hs
index b1bdb089cf..b3a327c4c6 100644
--- a/compiler/GHC/Hs/Utils.hs
+++ b/compiler/GHC/Hs/Utils.hs
@@ -112,12 +112,12 @@ import GHC.Hs.Extension
import TcEvidence
import RdrName
import Var
-import TyCoRep
-import Type ( appTyArgFlags, splitAppTys, tyConArgFlags, tyConAppNeedsKindSig )
+import GHC.Core.TyCo.Rep
+import GHC.Core.Type ( appTyArgFlags, splitAppTys, tyConArgFlags, tyConAppNeedsKindSig )
import TysWiredIn ( unitTy )
import TcType
-import DataCon
-import ConLike
+import GHC.Core.DataCon
+import GHC.Core.ConLike
import Id
import Name
import NameSet hiding ( unitFV )