From 647f960c266ad74d1af18f201ddac8120cff5abf Mon Sep 17 00:00:00 2001
From: Rob Rix <rob.rix@me.com>
Date: Wed, 24 Oct 2018 09:47:24 -0400
Subject: [PATCH] Fix SpecEff.

---
 test/Control/Abstract/Evaluator/Spec.hs | 40 ++++++++++++-------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/test/Control/Abstract/Evaluator/Spec.hs b/test/Control/Abstract/Evaluator/Spec.hs
index bdfdd0e99..c20ab0a32 100644
--- a/test/Control/Abstract/Evaluator/Spec.hs
+++ b/test/Control/Abstract/Evaluator/Spec.hs
@@ -35,9 +35,9 @@ spec = parallel $ do
 
 evaluate
   = runM
-  . runIgnoringTrace
+  . runTraceByIgnoring
   . runState (lowerBound @(Heap Precise Val))
-  . runFresh 0
+  . runFresh
   . runReader (PackageInfo (name "test") mempty)
   . runReader (ModuleInfo "test/Control/Abstract/Evaluator/Spec.hs")
   . runReader (lowerBound @Span)
@@ -59,24 +59,24 @@ reassociate = mergeErrors . mergeErrors . mergeErrors . Right
 
 type Val = Value SpecEff Precise
 newtype SpecEff = SpecEff
-  { runSpecEff :: Eff '[ Function SpecEff Precise Val
-                       , Boolean Val
-                       , Exc (LoopControl Precise)
-                       , Exc (Return Precise)
-                       , Env Precise
-                       , Allocator Precise
-                       , Deref Val
-                       , Resumable (BaseError (AddressError Precise Val))
-                       , Resumable (BaseError (EnvironmentError Precise))
-                       , Resumable (BaseError (ValueError SpecEff Precise))
-                       , Reader Span
-                       , Reader ModuleInfo
-                       , Reader PackageInfo
-                       , Fresh
-                       , State (Heap Precise Val)
-                       , Trace
-                       , Lift IO
-                       ] Precise
+  { runSpecEff :: Eff (FunctionC SpecEff Precise Val
+                 (Eff (BooleanC Val
+                 (Eff (ErrorC (LoopControl Precise)
+                 (Eff (ErrorC (Return Precise)
+                 (Eff (EnvC Precise
+                 (Eff (AllocatorC Precise
+                 (Eff (DerefC Val
+                 (Eff (ResumableC (BaseError (AddressError Precise Val))
+                 (Eff (ResumableC (BaseError (EnvironmentError Precise))
+                 (Eff (ResumableC (BaseError (ValueError SpecEff Precise))
+                 (Eff (ReaderC Span
+                 (Eff (ReaderC ModuleInfo
+                 (Eff (ReaderC PackageInfo
+                 (Eff (FreshC
+                 (Eff (StateC (Heap Precise Val)
+                 (Eff (TraceByIgnoringC
+                 (Eff (LiftC IO)))))))))))))))))))))))))))))))))
+                 Precise
   }
 
 instance Eq SpecEff where _ == _ = True