Can't eliminate MTL yet, but we can minimize it.

Author: Patrick Thomson

src/Diffing/Algorithm/RWS.hs

@@ -14,7 +14,7 @@ module Diffing.Algorithm.RWS
 , equalTerms
 ) where
 
-import Control.Monad.State.Strict
+import Control.Monad.Trans.State.Strict
 import Data.Diff (DiffF(..), deleting, inserting, merge, replacing)
 import qualified Data.KdMap.Static as KdMap
 import Data.List (sortOn)

src/Language/JSON/PrettyPrint.hs

@@ -8,16 +8,15 @@ module Language.JSON.PrettyPrint
 
 import Prologue
 
-import Control.Effect
-import Control.Effect.Error
-import Control.Monad.Trans (lift)
-import Streaming
+import           Control.Effect
+import           Control.Effect.Error
+import           Streaming
 import qualified Streaming.Prelude as Streaming
 
 import Data.Reprinting.Errors
+import Data.Reprinting.Scope
 import Data.Reprinting.Splice
 import Data.Reprinting.Token
-import Data.Reprinting.Scope
 
 -- | Default printing pipeline for JSON.
 defaultJSONPipeline :: (Member (Error TranslationError) sig, Carrier sig m)
@@ -35,9 +34,9 @@ printingJSON = Streaming.map step where
   step s@(Defer el cs) =
     let ins = New el cs
     in case (el, listToMaybe cs) of
-      (Truth True, _)      -> ins "true"
-      (Truth False, _)     -> ins "false"
-      (Nullity, _)         -> ins "null"
+      (Truth True, _)    -> ins "true"
+      (Truth False, _)   -> ins "false"
+      (Nullity, _)       -> ins "null"
 
       (Open,  Just List) -> ins "["
       (Close, Just List) -> ins "]"
@@ -48,7 +47,7 @@ printingJSON = Streaming.map step where
       (Sep, Just Pair)   -> ins ":"
       (Sep, Just Hash)   -> ins ","
 
-      _                    -> s
+      _                  -> s
   step x = x
 
 -- TODO: Fill out and implement configurable options like indentation count,
@@ -65,22 +64,22 @@ beautifyingJSON :: (Member (Error TranslationError) sig, Carrier sig m)
                 -> Stream (Of Fragment) m a
                 -> Stream (Of Splice) m a
 beautifyingJSON _ s = Streaming.for s step where
-  step (Defer el cs)   = lift (throwError (NoTranslation el cs))
+  step (Defer el cs)   = effect (throwError (NoTranslation el cs))
   step (Verbatim txt)  = emit txt
   step (New el cs txt) = case (el, cs) of
     (Open,  Hash:_)    -> emit txt *> layout HardWrap *> indent 2 (hashDepth cs)
     (Close, Hash:rest) -> layout HardWrap *> indent 2 (hashDepth rest) *> emit txt
     (Sep,   List:_)    -> emit txt *> space
     (Sep,   Pair:_)    -> emit txt *> space
     (Sep,   Hash:_)    -> emit txt *> layout HardWrap *> indent 2 (hashDepth cs)
-    _                    -> emit txt
+    _                  -> emit txt
 
 -- | Produce whitespace minimal JSON.
 minimizingJSON :: (Member (Error TranslationError) sig, Carrier sig m)
                => Stream (Of Fragment) m a
                -> Stream (Of Splice) m a
 minimizingJSON s = Streaming.for s step where
-  step (Defer el cs)  = lift (throwError (NoTranslation el cs))
+  step (Defer el cs)  = effect (throwError (NoTranslation el cs))
   step (Verbatim txt) = emit txt
   step (New _ _ txt)  = emit txt
 

src/Language/Python/PrettyPrint.hs

@@ -4,7 +4,6 @@ module Language.Python.PrettyPrint ( printingPython ) where
 
 import Control.Effect
 import Control.Effect.Error
-import Control.Monad.Trans (lift)
 import Streaming
 import qualified Streaming.Prelude as Streaming
 
@@ -66,7 +65,7 @@ step (Defer el cs)  = case (el, cs) of
   (Sep,   Imperative:xs)        -> layout HardWrap *> indent 4 (imperativeDepth xs)
   (Close, Imperative:_)         -> pure ()
 
-  _                              -> lift (throwError (NoTranslation el cs))
+  _                             -> effect (throwError (NoTranslation el cs))
 
   where
     endContext times = layout HardWrap *> indent 4 (pred times)

src/Language/Ruby/PrettyPrint.hs

@@ -52,9 +52,9 @@ step (Defer el cs)  = case (el, cs) of
   (Close, [Imperative])         -> layout HardWrap
   (Close, Imperative:xs)        -> indent 2 (pred (imperativeDepth xs))
 
-  (Sep, Call:_)                -> emit "."
+  (Sep, Call:_)                 -> emit "."
 
-  _                              -> lift (throwError (NoTranslation el cs))
+  _                             -> effect (throwError (NoTranslation el cs))
 
   where
     endContext times = layout HardWrap *> indent 2 (pred times)