From 4703a365b3d1e82a1fed59f84efcae8d4bf5ef66 Mon Sep 17 00:00:00 2001 From: Ning Zhang Date: Fri, 21 Aug 2020 16:51:23 +1000 Subject: [PATCH] Fix strict build errors --- app/library/Main.hs | 4 +--- src/Demo.hs | 16 ++++++---------- src/Library.hs | 3 --- 3 files changed, 7 insertions(+), 16 deletions(-) diff --git a/app/library/Main.hs b/app/library/Main.hs index 737a96f..c9c8460 100644 --- a/app/library/Main.hs +++ b/app/library/Main.hs @@ -2,9 +2,7 @@ module Main where -import Control.Monad.IO.Class ( MonadIO - , liftIO - ) +import Control.Monad.IO.Class ( liftIO ) import Control.Monad.Logger as L import qualified Data.Text as T diff --git a/src/Demo.hs b/src/Demo.hs index 818ebb1..350f5c7 100644 --- a/src/Demo.hs +++ b/src/Demo.hs @@ -6,7 +6,6 @@ module Demo where import qualified Control.Exception.Safe as E import Control.Exception.Safe ( MonadCatch - , MonadMask , MonadThrow ) import Control.Monad.IO.Class ( MonadIO @@ -21,9 +20,6 @@ import Control.Monad.Reader ( MonadReader , ask , runReaderT ) -import Control.Monad.Trans.Class ( MonadTrans - , lift - ) import Data.Default.Class ( Default , def ) @@ -65,7 +61,7 @@ runDemo :: DemoEnv -> Demo a -> IO a runDemo env demo = L.runStderrLoggingT $ runReaderT (runDemoT demo) env warpApp :: Application -warpApp req respond = E.bracket_ +warpApp _req respond = E.bracket_ (L.runStderrLoggingT ($(L.logInfo) "Try IO Block")) (L.runStderrLoggingT ($(L.logInfo) "Clean IO Block")) (respond $ Wai.responseLBS HTTP.status200 @@ -90,12 +86,12 @@ runDemoApp = do demoHost <- lookupEnv "DEMO_HOST" demoPort <- lookupEnv "DEMO_PORT" let defaultEnv = def :: DemoEnv - defaultEnv <- return $ maybe + defaultEnv' <- return $ maybe defaultEnv (\host -> defaultEnv { demoEnvHost = read host }) demoHost - defaultEnv <- return $ maybe - defaultEnv - (\port -> defaultEnv { demoEnvPort = read port }) + defaultEnv'' <- return $ maybe + defaultEnv' + (\port -> defaultEnv' { demoEnvPort = read port }) demoPort - runDemo defaultEnv demoApp + runDemo defaultEnv'' demoApp diff --git a/src/Library.hs b/src/Library.hs index 1548051..0ae1b2f 100644 --- a/src/Library.hs +++ b/src/Library.hs @@ -4,9 +4,6 @@ module Library where -import Control.Monad.IO.Class ( MonadIO - , liftIO - ) import Control.Monad.Logger as L import Control.Monad.Logger ( LoggingT , MonadLogger