From 0e7c39d9ec6719a32eec0b696d7167faf6598757 Mon Sep 17 00:00:00 2001
From: jao <jao@gnu.org>
Date: Fri, 7 Aug 2020 03:33:15 +0100
Subject: Redundant imports (mostly <$>) removed
---
src/Xmobar/App/EventLoop.hs | 3 +--
src/Xmobar/App/Main.hs | 5 ++---
src/Xmobar/Plugins/MarqueePipeReader.hs | 1 -
src/Xmobar/Plugins/Monitors/Bright.hs | 2 --
src/Xmobar/Plugins/Monitors/Common/Parsers.hs | 3 +--
src/Xmobar/Plugins/Monitors/MultiCpu.hs | 1 -
src/Xmobar/Plugins/Monitors/Net.hs | 1 -
src/Xmobar/Plugins/Monitors/Volume.hs | 3 +--
src/Xmobar/Plugins/PipeReader.hs | 1 -
src/Xmobar/System/Environment.hs | 1 -
src/Xmobar/X11/Draw.hs | 3 +--
src/Xmobar/X11/Window.hs | 3 +--
12 files changed, 7 insertions(+), 20 deletions(-)
diff --git a/src/Xmobar/App/EventLoop.hs b/src/Xmobar/App/EventLoop.hs
index cad95a5..e6232cd 100644
--- a/src/Xmobar/App/EventLoop.hs
+++ b/src/Xmobar/App/EventLoop.hs
@@ -3,7 +3,7 @@
------------------------------------------------------------------------------
-- |
-- Module: Xmobar.X11.EventLoop
--- Copyright: (c) 2018 Jose Antonio Ortega Ruiz
+-- Copyright: (c) 2018, 2020 Jose Antonio Ortega Ruiz
-- License: BSD3-style (see LICENSE)
--
-- Maintainer: jao@gnu.org
@@ -31,7 +31,6 @@ import Graphics.X11.Xinerama
import Graphics.X11.Xrandr
import Control.Arrow ((&&&))
-import Control.Applicative ((<$>))
import Control.Monad.Reader
import Control.Concurrent
import Control.Concurrent.Async (Async, async)
diff --git a/src/Xmobar/App/Main.hs b/src/Xmobar/App/Main.hs
index f173e12..03a01a1 100644
--- a/src/Xmobar/App/Main.hs
+++ b/src/Xmobar/App/Main.hs
@@ -1,7 +1,7 @@
------------------------------------------------------------------------------
-- |
-- Module: Xmobar.App.Main
--- Copyright: (c) 2018, 2019 Jose Antonio Ortega Ruiz
+-- Copyright: (c) 2018, 2019, 2020 Jose Antonio Ortega Ruiz
-- License: BSD3-style (see LICENSE)
--
-- Maintainer: jao@gnu.org
@@ -26,8 +26,7 @@ import qualified Data.Map as Map
import Data.List (intercalate)
import System.Posix.Process (executeFile)
import System.Environment (getArgs)
-import System.FilePath
-import System.FilePath.Posix (takeBaseName, takeDirectory)
+import System.FilePath ((</>), takeBaseName, takeDirectory, takeExtension)
import Text.Parsec.Error (ParseError)
import Data.List.NonEmpty (NonEmpty(..))
diff --git a/src/Xmobar/Plugins/MarqueePipeReader.hs b/src/Xmobar/Plugins/MarqueePipeReader.hs
index f1fdee0..075503c 100644
--- a/src/Xmobar/Plugins/MarqueePipeReader.hs
+++ b/src/Xmobar/Plugins/MarqueePipeReader.hs
@@ -22,7 +22,6 @@ import Control.Concurrent(forkIO, threadDelay)
import Control.Concurrent.STM (TChan, atomically, writeTChan, tryReadTChan, newTChan)
import Control.Exception
import Control.Monad(forever, unless)
-import Control.Applicative ((<$>))
type Length = Int -- length of the text to display
type Rate = Int -- delay in tenth seconds
diff --git a/src/Xmobar/Plugins/Monitors/Bright.hs b/src/Xmobar/Plugins/Monitors/Bright.hs
index 5f0cd0d..12790e1 100644
--- a/src/Xmobar/Plugins/Monitors/Bright.hs
+++ b/src/Xmobar/Plugins/Monitors/Bright.hs
@@ -14,7 +14,6 @@
module Xmobar.Plugins.Monitors.Bright (brightConfig, runBright) where
-import Control.Applicative ((<$>))
import Control.Exception (SomeException, handle)
import qualified Data.ByteString.Lazy.Char8 as B
import System.FilePath ((</>))
@@ -89,4 +88,3 @@ readBright files = do
return (currVal / maxVal)
where grab f = handle handler (read . B.unpack <$> B.readFile f)
handler = const (return 0) :: SomeException -> IO Float
-
diff --git a/src/Xmobar/Plugins/Monitors/Common/Parsers.hs b/src/Xmobar/Plugins/Monitors/Common/Parsers.hs
index db2a652..c058154 100644
--- a/src/Xmobar/Plugins/Monitors/Common/Parsers.hs
+++ b/src/Xmobar/Plugins/Monitors/Common/Parsers.hs
@@ -4,7 +4,7 @@
------------------------------------------------------------------------------
-- |
-- Module: Xmobar.Plugins.Monitors.Parsers
--- Copyright: (c) 2018 Jose Antonio Ortega Ruiz
+-- Copyright: (c) 2018, 2020 Jose Antonio Ortega Ruiz
-- License: BSD3-style (see LICENSE)
--
-- Maintainer: jao@gnu.org
@@ -36,7 +36,6 @@ module Xmobar.Plugins.Monitors.Common.Parsers ( runP
import Xmobar.Plugins.Monitors.Common.Types
-import Control.Applicative ((<$>))
import qualified Data.Map as Map
import System.Console.GetOpt (ArgOrder(Permute), OptDescr, getOpt)
import Text.ParserCombinators.Parsec
diff --git a/src/Xmobar/Plugins/Monitors/MultiCpu.hs b/src/Xmobar/Plugins/Monitors/MultiCpu.hs
index 936bb2e..0bef8cf 100644
--- a/src/Xmobar/Plugins/Monitors/MultiCpu.hs
+++ b/src/Xmobar/Plugins/Monitors/MultiCpu.hs
@@ -15,7 +15,6 @@
module Xmobar.Plugins.Monitors.MultiCpu (startMultiCpu) where
import Xmobar.Plugins.Monitors.Common
-import Control.Applicative ((<$>))
import qualified Data.ByteString.Lazy.Char8 as B
import Data.List (isPrefixOf, transpose, unfoldr)
import Data.IORef (IORef, newIORef, readIORef, writeIORef)
diff --git a/src/Xmobar/Plugins/Monitors/Net.hs b/src/Xmobar/Plugins/Monitors/Net.hs
index 97deacd..23e0154 100644
--- a/src/Xmobar/Plugins/Monitors/Net.hs
+++ b/src/Xmobar/Plugins/Monitors/Net.hs
@@ -23,7 +23,6 @@ module Xmobar.Plugins.Monitors.Net (
import Xmobar.Plugins.Monitors.Common
import Data.IORef (IORef, newIORef, readIORef, writeIORef)
-import Data.Monoid ((<>))
import Data.Time.Clock (UTCTime, getCurrentTime, diffUTCTime)
import Data.Word (Word64)
import Control.Monad (forM, filterM)
diff --git a/src/Xmobar/Plugins/Monitors/Volume.hs b/src/Xmobar/Plugins/Monitors/Volume.hs
index 8840472..9492201 100644
--- a/src/Xmobar/Plugins/Monitors/Volume.hs
+++ b/src/Xmobar/Plugins/Monitors/Volume.hs
@@ -21,9 +21,8 @@ module Xmobar.Plugins.Monitors.Volume
, VolumeOpts
) where
-import Control.Applicative ( (<$>), liftA3 )
+import Control.Applicative ( liftA3 )
import Control.Monad ( liftM2, liftM3, mplus )
-import Data.Traversable (sequenceA)
import Xmobar.Plugins.Monitors.Common
import Sound.ALSA.Mixer
import qualified Sound.ALSA.Exception as AE
diff --git a/src/Xmobar/Plugins/PipeReader.hs b/src/Xmobar/Plugins/PipeReader.hs
index 1a10abf..60f9494 100644
--- a/src/Xmobar/Plugins/PipeReader.hs
+++ b/src/Xmobar/Plugins/PipeReader.hs
@@ -21,7 +21,6 @@ import System.Posix.Files
import Control.Concurrent(threadDelay)
import Control.Exception
import Control.Monad(forever, unless)
-import Control.Applicative ((<$>))
data PipeReader = PipeReader String String
deriving (Read, Show)
diff --git a/src/Xmobar/System/Environment.hs b/src/Xmobar/System/Environment.hs
index 86197db..25802fe 100644
--- a/src/Xmobar/System/Environment.hs
+++ b/src/Xmobar/System/Environment.hs
@@ -13,7 +13,6 @@
-----------------------------------------------------------------------------
module Xmobar.System.Environment(expandEnv) where
-import Control.Applicative ((<$>))
import Data.Maybe (fromMaybe)
import System.Environment (lookupEnv)
diff --git a/src/Xmobar/X11/Draw.hs b/src/Xmobar/X11/Draw.hs
index b7f58ca..ab7c6df 100644
--- a/src/Xmobar/X11/Draw.hs
+++ b/src/Xmobar/X11/Draw.hs
@@ -3,7 +3,7 @@
------------------------------------------------------------------------------
-- |
-- Module: Xmobar.X11.Draw
--- Copyright: (c) 2018 Jose Antonio Ortega Ruiz
+-- Copyright: (c) 2018, 2020 Jose Antonio Ortega Ruiz
-- License: BSD3-style (see LICENSE)
--
-- Maintainer: jao@gnu.org
@@ -22,7 +22,6 @@ module Xmobar.X11.Draw (drawInWin) where
import Prelude hiding (lookup)
import Control.Monad.IO.Class
import Control.Monad.Reader
-import Control.Monad (when)
import Control.Arrow ((&&&))
import Data.Map hiding (foldr, map, filter)
import qualified Data.List.NonEmpty as NE
diff --git a/src/Xmobar/X11/Window.hs b/src/Xmobar/X11/Window.hs
index b8f56c6..8c3c698 100644
--- a/src/Xmobar/X11/Window.hs
+++ b/src/Xmobar/X11/Window.hs
@@ -1,7 +1,7 @@
-----------------------------------------------------------------------------
-- |
-- Module : Window
--- Copyright : (c) 2011-18 Jose A. Ortega Ruiz
+-- Copyright : (c) 2011-18, 20 Jose A. Ortega Ruiz
-- : (c) 2012 Jochen Keil
-- License : BSD-style (see LICENSE)
--
@@ -16,7 +16,6 @@
module Xmobar.X11.Window where
import Prelude
-import Control.Applicative ((<$>))
import Control.Monad (when, unless)
import Graphics.X11.Xlib hiding (textExtents)
import Graphics.X11.Xlib.Extras
--
cgit v1.2.3