diff options
| author | Simon Peyton Jones <simonpj@microsoft.com> | 2020-05-31 23:32:00 +0100 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2020-06-25 03:54:40 -0400 |
| commit | 0d61f866b43d3385be3a8521ba24503c13e8d404 (patch) | |
| tree | cf97fd3548853a1f4a01ebd796d822d50c3a9375 /compiler/GHC/Tc/Utils/Unify.hs | |
| parent | 4acc2934952f4849c2082015d9bebef446d46545 (diff) | |
| download | haskell-0d61f866b43d3385be3a8521ba24503c13e8d404.tar.gz | |
Expunge GhcTcId
GHC.Hs.Extension had
type GhcPs = GhcPass 'Parsed
type GhcRn = GhcPass 'Renamed
type GhcTc = GhcPass 'Typechecked
type GhcTcId = GhcTc
The last of these, GhcTcId, is a vestige of the past.
This patch expunges it from GHC.
Diffstat (limited to 'compiler/GHC/Tc/Utils/Unify.hs')
| -rw-r--r-- | compiler/GHC/Tc/Utils/Unify.hs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/compiler/GHC/Tc/Utils/Unify.hs b/compiler/GHC/Tc/Utils/Unify.hs index 75f4e83979..a7787dd4ea 100644 --- a/compiler/GHC/Tc/Utils/Unify.hs +++ b/compiler/GHC/Tc/Utils/Unify.hs @@ -510,22 +510,22 @@ expected_ty. ----------------- -- tcWrapResult needs both un-type-checked (for origins and error messages) -- and type-checked (for wrapping) expressions -tcWrapResult :: HsExpr GhcRn -> HsExpr GhcTcId -> TcSigmaType -> ExpRhoType - -> TcM (HsExpr GhcTcId) +tcWrapResult :: HsExpr GhcRn -> HsExpr GhcTc -> TcSigmaType -> ExpRhoType + -> TcM (HsExpr GhcTc) tcWrapResult rn_expr = tcWrapResultO (exprCtOrigin rn_expr) rn_expr -tcWrapResultO :: CtOrigin -> HsExpr GhcRn -> HsExpr GhcTcId -> TcSigmaType -> ExpRhoType - -> TcM (HsExpr GhcTcId) +tcWrapResultO :: CtOrigin -> HsExpr GhcRn -> HsExpr GhcTc -> TcSigmaType -> ExpRhoType + -> TcM (HsExpr GhcTc) tcWrapResultO orig rn_expr expr actual_ty res_ty = do { traceTc "tcWrapResult" (vcat [ text "Actual: " <+> ppr actual_ty , text "Expected:" <+> ppr res_ty ]) ; wrap <- tcSubTypeNC orig GenSigCtxt (Just rn_expr) actual_ty res_ty ; return (mkHsWrap wrap expr) } -tcWrapResultMono :: HsExpr GhcRn -> HsExpr GhcTcId +tcWrapResultMono :: HsExpr GhcRn -> HsExpr GhcTc -> TcRhoType -- Actual -- a rho-type not a sigma-type -> ExpRhoType -- Expected - -> TcM (HsExpr GhcTcId) + -> TcM (HsExpr GhcTc) -- A version of tcWrapResult to use when the actual type is a -- rho-type, so nothing to instantiate; just go straight to unify. -- It means we don't need to pass in a CtOrigin |