summaryrefslogtreecommitdiff
path: root/compiler/typecheck/TcDerivInfer.hs
diff options
context:
space:
mode:
authorSimon Peyton Jones <simonpj@microsoft.com>2018-11-12 08:30:33 +0000
committerSimon Peyton Jones <simonpj@microsoft.com>2018-11-26 09:48:46 +0000
commit7c61052d1162626382f234612541da187cce694f (patch)
tree72d789ced0b866282c0b16e368d9444ab7f2f906 /compiler/typecheck/TcDerivInfer.hs
parent326f87a2028b6254dd0fd0f722564740e99cf108 (diff)
downloadhaskell-7c61052d1162626382f234612541da187cce694f.tar.gz
Combine kcImplicitTKBndrs and tcImplicitTKBndrs
Based on a conversation with Richard on Friday, this patch * Abolishes the distinction between kcImplicitTKBndrs and tcImplicitTKBndrs; now it is bindImplicitTKBndrs * Same for kc/tcExplicitTKBndrs * tcImplicitTKBndrs no longer does a solveLocalEqualities and sort; the caller does that Much nicer. Not quite working yet though
Diffstat (limited to 'compiler/typecheck/TcDerivInfer.hs')
-rw-r--r--compiler/typecheck/TcDerivInfer.hs2
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/typecheck/TcDerivInfer.hs b/compiler/typecheck/TcDerivInfer.hs
index 3f4192fb42..b026f1d68c 100644
--- a/compiler/typecheck/TcDerivInfer.hs
+++ b/compiler/typecheck/TcDerivInfer.hs
@@ -683,7 +683,7 @@ simplifyDeriv pred tvs thetas
-- with the skolemized variables. Start "one level down" because
-- we are going to wrap the result in an implication with tvs_skols,
-- in step [DAC RESIDUAL]
- ; (wanteds, tc_lvl) <- pushTcLevelM $
+ ; (tc_lvl, wanteds) <- pushTcLevelM $
mapM mk_wanteds thetas
; traceTc "simplifyDeriv inputs" $