From a834aeecc7afbd9b401f3604080e2b2a96c2df9e Mon Sep 17 00:00:00 2001
From: Jens Nolte <jens@nightmarestudio.de>
Date: Tue, 18 Feb 2020 17:13:43 +0100
Subject: [PATCH] Move some exports from Control.Monad to Prelude
---
src/Prelude.hs | 17 +++++++++++------
src/QBar/ControlSocket.hs | 1 -
src/QBar/Core.hs | 1 -
src/QBar/Host.hs | 1 -
src/QBar/Server.hs | 2 +-
src/QBar/Time.hs | 1 -
6 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/src/Prelude.hs b/src/Prelude.hs
index 945d807..596792e 100644
--- a/src/Prelude.hs
+++ b/src/Prelude.hs
@@ -2,20 +2,24 @@
module Prelude
( module BasePrelude,
- head,
+ ByteString.ByteString,
+ Text.Text,
+ Maybe.listToMaybe,
error,
errorWithoutStackTrace,
- undefined,
- Text.Text,
- ByteString.ByteString,
+ forever,
+ head,
+ intercalate,
trace,
traceId,
traceShow,
traceShowId,
traceM,
traceShowM,
- Maybe.listToMaybe,
- intercalate
+ undefined,
+ unless,
+ void,
+ when
)
where
@@ -26,6 +30,7 @@ import BasePrelude hiding
undefined,
)
import qualified BasePrelude as P
+import Control.Monad (forever, void, when, unless)
import qualified Data.ByteString as ByteString
import qualified Data.Maybe as Maybe
import qualified Data.Text.Lazy as Text
diff --git a/src/QBar/ControlSocket.hs b/src/QBar/ControlSocket.hs
index 632d486..5b3c6e5 100644
--- a/src/QBar/ControlSocket.hs
+++ b/src/QBar/ControlSocket.hs
@@ -14,7 +14,6 @@ import QBar.Host
import QBar.Util
import Control.Exception (SomeException, handle)
-import Control.Monad (forever, void, when)
import Control.Concurrent (forkFinally)
import Control.Concurrent.Async
import Data.Aeson (FromJSON, ToJSON)
diff --git a/src/QBar/Core.hs b/src/QBar/Core.hs
index 46bd95c..3638ae9 100644
--- a/src/QBar/Core.hs
+++ b/src/QBar/Core.hs
@@ -12,7 +12,6 @@ import Control.Concurrent.MVar
import Control.Concurrent.STM.TChan (TChan, writeTChan)
import Control.Exception (IOException)
import Control.Lens
-import Control.Monad (forever, when)
import Control.Monad.Reader (ReaderT, runReaderT, ask)
import Control.Monad.State (StateT)
import Control.Monad.Writer (WriterT)
diff --git a/src/QBar/Host.hs b/src/QBar/Host.hs
index 2ba09a0..e191194 100644
--- a/src/QBar/Host.hs
+++ b/src/QBar/Host.hs
@@ -11,7 +11,6 @@ import Control.Concurrent.Event as Event
import Control.Concurrent.STM.TChan (TChan, newTChanIO, tryReadTChan)
import Control.Exception (SomeException, catch)
import Control.Lens hiding (each, (.=))
-import Control.Monad (when)
import Control.Monad.STM (atomically)
import Data.IORef (IORef, newIORef, readIORef, writeIORef)
import Data.Maybe (catMaybes, mapMaybe)
diff --git a/src/QBar/Server.hs b/src/QBar/Server.hs
index d36cbf0..324d2ae 100644
--- a/src/QBar/Server.hs
+++ b/src/QBar/Server.hs
@@ -11,7 +11,7 @@ import QBar.Pango
import QBar.Theme
import QBar.Util
-import Control.Monad (when, unless, forM_)
+import Control.Monad (forM_)
import Control.Concurrent.Async (async, link)
import Control.Concurrent.Event as Event
import Control.Concurrent.MVar (MVar, newMVar, modifyMVar, modifyMVar_)
diff --git a/src/QBar/Time.hs b/src/QBar/Time.hs
index e7afdc5..fa205f2 100644
--- a/src/QBar/Time.hs
+++ b/src/QBar/Time.hs
@@ -1,7 +1,6 @@
module QBar.Time (sleepUntil, nextMinute) where
import Control.Concurrent (threadDelay)
-import Control.Monad (when)
import Data.Time.Clock (UTCTime, getCurrentTime, diffUTCTime, utctDayTime)
sleepUntil :: UTCTime -> IO ()
--
GitLab