diff options
Diffstat (limited to 'compiler/typecheck/TcRnDriver.hs')
| -rw-r--r-- | compiler/typecheck/TcRnDriver.hs | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/compiler/typecheck/TcRnDriver.hs b/compiler/typecheck/TcRnDriver.hs index 9a1d9e118f..35ac44f0bd 100644 --- a/compiler/typecheck/TcRnDriver.hs +++ b/compiler/typecheck/TcRnDriver.hs @@ -1789,13 +1789,13 @@ tcRnExpr hsc_env rdr_expr let { fresh_it = itName uniq (getLoc rdr_expr) } ; ((_tc_expr, res_ty), tclvl, lie) <- pushLevelAndCaptureConstraints $ tcInferRho rn_expr ; - ((qtvs, dicts, _, _), lie_top) <- captureConstraints $ - {-# SCC "simplifyInfer" #-} - simplifyInfer tclvl - False {- No MR for now -} - [] {- No sig vars -} - [(fresh_it, res_ty)] - lie ; + ((qtvs, dicts, _), lie_top) <- captureConstraints $ + {-# SCC "simplifyInfer" #-} + simplifyInfer tclvl + False {- No MR for now -} + [] {- No sig vars -} + [(fresh_it, res_ty)] + lie ; -- Wanted constraints from static forms stWC <- tcg_static_wc <$> getGblEnv >>= readTcRef ; @@ -2071,7 +2071,7 @@ pprTcGblEnv (TcGblEnv { tcg_type_env = type_env, , ptext (sLit "Dependent modules:") <+> ppr (sortBy cmp_mp $ eltsUFM (imp_dep_mods imports)) , ptext (sLit "Dependent packages:") <+> - ppr (sortBy stablePackageKeyCmp $ imp_dep_pkgs imports)] + ppr (sortBy stableUnitIdCmp $ imp_dep_pkgs imports)] where -- The two uses of sortBy are just to reduce unnecessary -- wobbling in testsuite output cmp_mp (mod_name1, is_boot1) (mod_name2, is_boot2) |