From fded9c41cbfaa8e9c7df91ebcd9156ff938a9dfa Mon Sep 17 00:00:00 2001 From: mbays Date: Tue, 8 Aug 2023 00:00:00 +0000 Subject: [PATCH] fix incompatibility with mtl-2.3 --- LineClient.hs | 8 ++++++-- TextGemini.hs | 3 ++- diohsc.hs | 5 +++-- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/LineClient.hs b/LineClient.hs index 8888a1d..f48b6d0 100644 --- a/LineClient.hs +++ b/LineClient.hs @@ -19,8 +19,12 @@ module LineClient (lineClient) where import qualified Codec.MIME.Parse as MIME import qualified Codec.MIME.Type as MIME import Control.Applicative (Alternative, empty) -import Control.Monad.Catch -import Control.Monad.State +import Control.Monad (forM_, guard, join, mplus, msum, + mzero, unless, void, when, (<=<)) +import Control.Monad.Catch (SomeException, bracket, + displayException, handle) +import Control.Monad.IO.Class (MonadIO, liftIO) +import Control.Monad.State (get, gets, lift, modify) import Control.Monad.Trans.Maybe (MaybeT (..), runMaybeT) import Data.Bifunctor (second) diff --git a/TextGemini.hs b/TextGemini.hs index bfaf878..a4f59a6 100644 --- a/TextGemini.hs +++ b/TextGemini.hs @@ -14,7 +14,8 @@ module TextGemini where -import Control.Monad.State +import Control.Monad (forM) +import Control.Monad.State (State, evalState, gets, modify) import Data.Maybe (catMaybes, isJust, mapMaybe) import ANSIColour diff --git a/diohsc.hs b/diohsc.hs index 52b8bcd..c1253c8 100644 --- a/diohsc.hs +++ b/diohsc.hs @@ -16,8 +16,9 @@ module Main where -import Control.Monad.Catch -import Control.Monad.State +import Control.Monad (join, unless, when) +import Control.Monad.Catch (bracketOnError) +import Control.Monad.State (execStateT) import Data.Hashable (hash) import Data.Maybe -- 2.11.4.GIT