From 6407fd56d1eb0b4ae759e4b794ff98d0673f02e7 Mon Sep 17 00:00:00 2001 From: Joshua Potter Date: Mon, 16 Dec 2019 11:07:46 -0500 Subject: [PATCH] Remove reference to mtl. --- package.yaml | 5 ++--- postlude.cabal | 7 +++---- src/Postlude.hs | 21 +++++---------------- src/Postlude/Lazy.hs | 6 ++++-- src/Postlude/Strict.hs | 6 ++++-- stack.yaml | 3 +-- stack.yaml.lock | 8 ++++---- 7 files changed, 23 insertions(+), 33 deletions(-) diff --git a/package.yaml b/package.yaml index 457b8d4..c334ada 100644 --- a/package.yaml +++ b/package.yaml @@ -22,9 +22,8 @@ description: Please see the README on Github at dependencies: - base >=4.7 && <5 - bytestring >=0.10.8.1 && <0.11 - - exceptions >=0.6 && <0.9 - - free >=4.12 && <=5.0.1 - - mtl >=2.2.1 && <2.3 + - exceptions >=0.6 && <0.11 + - free >=5.0.1 && <6 - text >=1.2.2.2 && <1.3 - transformers >=0.4 && <0.6 diff --git a/postlude.cabal b/postlude.cabal index 604e27f..b349fc8 100644 --- a/postlude.cabal +++ b/postlude.cabal @@ -4,7 +4,7 @@ cabal-version: 1.12 -- -- see: https://github.com/sol/hpack -- --- hash: 279baf8a9c78e19c42e376ae268fa1e0869c2f0f3a7cf2c091f4d286fcaadcb6 +-- hash: dfac36d217ad061f0c553491a9c1b6f14008ae9d0955634102e91bd883e19642 name: postlude version: 0.1.1.0 @@ -36,9 +36,8 @@ library build-depends: base >=4.7 && <5 , bytestring >=0.10.8.1 && <0.11 - , exceptions >=0.6 && <0.9 - , free >=4.12 && <=5.0.1 - , mtl >=2.2.1 && <2.3 + , exceptions >=0.6 && <0.11 + , free >=5.0.1 && <6 , text >=1.2.2.2 && <1.3 , transformers >=0.4 && <0.6 default-language: Haskell2010 diff --git a/src/Postlude.hs b/src/Postlude.hs index 5462cb2..cd5e203 100644 --- a/src/Postlude.hs +++ b/src/Postlude.hs @@ -83,30 +83,18 @@ import Control.Monad.Catch as X , try ) -import Control.Monad.Except as X - ( MonadError, catchError, throwError - ) - -import Control.Monad.Reader as X - ( MonadReader, ask, local, reader - ) - -import Control.Monad.State as X - ( MonadState, get, put, state - ) - -import Control.Monad.Trans as X +import Control.Monad.IO.Class as X ( MonadIO, liftIO - , MonadTrans, lift ) -import Control.Monad.Writer as X - ( MonadWriter, listen, pass, tell, writer +import Control.Monad.Trans.Class as X + ( MonadTrans, lift ) import Control.Monad.Trans.Except as X ( Except , ExceptT, ExceptT(ExceptT), runExceptT + , catchE, throwE ) import Control.Monad.Trans.Free as X @@ -119,6 +107,7 @@ import Control.Monad.Trans.Free as X import Control.Monad.Trans.Reader as X ( Reader , ReaderT, ReaderT(ReaderT), runReaderT + , ask, local, reader ) import Data.Bits as X diff --git a/src/Postlude/Lazy.hs b/src/Postlude/Lazy.hs index 4ba1beb..27a9531 100644 --- a/src/Postlude/Lazy.hs +++ b/src/Postlude/Lazy.hs @@ -5,13 +5,15 @@ module Postlude.Lazy ) where import Control.Monad.Trans.State as L - ( State + ( State, runState , StateT, StateT(StateT), runStateT + , get, put, state ) import Control.Monad.Trans.Writer as L - ( Writer + ( Writer, runWriter , WriterT, WriterT(WriterT), runWriterT + , listen, pass, tell, writer ) import Data.ByteString.Lazy as L diff --git a/src/Postlude/Strict.hs b/src/Postlude/Strict.hs index 1c1c2d7..360eb7b 100644 --- a/src/Postlude/Strict.hs +++ b/src/Postlude/Strict.hs @@ -5,13 +5,15 @@ module Postlude.Strict ) where import Control.Monad.Trans.State.Strict as S - ( State + ( State, runState , StateT, StateT(StateT), runStateT + , get, put, state ) import Control.Monad.Trans.Writer.Strict as S - ( Writer + ( Writer, runWriter , WriterT, WriterT(WriterT), runWriterT + , listen, pass, tell, writer ) import Data.ByteString as S diff --git a/stack.yaml b/stack.yaml index d092a5b..4edb63d 100644 --- a/stack.yaml +++ b/stack.yaml @@ -8,8 +8,7 @@ # A snapshot resolver dictates the compiler version and the set of packages # to be used for project dependencies. For example: # -# resolver: lts-3.5 -resolver: nightly-2018-03-14 +resolver: lts-14.17 # resolver: ghc-7.10.2 # resolver: ghcjs-0.1.0_ghc-7.10.2 # resolver: diff --git a/stack.yaml.lock b/stack.yaml.lock index a8d7615..fc538c1 100644 --- a/stack.yaml.lock +++ b/stack.yaml.lock @@ -6,7 +6,7 @@ packages: [] snapshots: - completed: - size: 188042 - url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/nightly/2018/3/14.yaml - sha256: 2f1331f747e54e58abbc85754bacaf8dbd5a54444ee87d5757a2bafc0a4afa2f - original: nightly-2018-03-14 + size: 524799 + url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/14/17.yaml + sha256: 1d72b33c0fc048e23f4f18fd76a6ad79dd1d8a3c054644098a71a09855e40c7c + original: lts-14.17