From 78d526d1dd87eb8ca8f0f15568c91369f8201155 Mon Sep 17 00:00:00 2001 From: slotThe Date: Mon, 14 Dec 2020 13:41:28 +0100 Subject: [PATCH] Get rid of unused imports Starting with 5240116f3cdf169e3aa226d9f8206a5f5b99c867 we only support GHC versions 8.4.4 and up (more precisely, the GHC version associated with stackage lts-12 and up). The imports in question are now in Prelude and need not be imported explicitly. --- XMonad/Actions/DynamicProjects.hs | 1 - XMonad/Actions/GridSelect.hs | 1 - XMonad/Actions/ShowText.hs | 2 +- XMonad/Actions/TreeSelect.hs | 1 - XMonad/Actions/WorkspaceCursors.hs | 4 +--- XMonad/Config/Bluetile.hs | 1 - XMonad/Config/Dmwit.hs | 1 - XMonad/Hooks/DebugEvents.hs | 1 - XMonad/Hooks/DynamicProperty.hs | 1 - XMonad/Hooks/EwmhDesktops.hs | 1 - XMonad/Hooks/FadeWindows.hs | 3 +-- XMonad/Hooks/Focus.hs | 3 +-- XMonad/Hooks/ManageDocks.hs | 3 +-- XMonad/Hooks/WallpaperSetter.hs | 3 --- XMonad/Hooks/XPropManage.hs | 2 +- XMonad/Layout/BinarySpacePartition.hs | 1 - XMonad/Layout/IndependentScreens.hs | 1 - XMonad/Layout/Master.hs | 1 - XMonad/Layout/Mosaic.hs | 4 +--- XMonad/Layout/SortedLayout.hs | 1 - XMonad/Layout/SubLayouts.hs | 1 - XMonad/Layout/TallMastersCombo.hs | 15 ++++----------- XMonad/Prompt/Ssh.hs | 1 - XMonad/Prompt/Unicode.hs | 2 -- XMonad/Util/Font.hs | 2 -- XMonad/Util/Invisible.hs | 1 - XMonad/Util/Loggers.hs | 1 - XMonad/Util/PureX.hs | 2 +- XMonad/Util/RemoteWindows.hs | 1 - XMonad/Util/Timer.hs | 1 - XMonad/Util/WorkspaceCompare.hs | 1 - 31 files changed, 12 insertions(+), 52 deletions(-) diff --git a/XMonad/Actions/DynamicProjects.hs b/XMonad/Actions/DynamicProjects.hs index 7c631e98..18fa928d 100644 --- a/XMonad/Actions/DynamicProjects.hs +++ b/XMonad/Actions/DynamicProjects.hs @@ -49,7 +49,6 @@ import Data.List (sort, union, stripPrefix) import Data.Map.Strict (Map) import qualified Data.Map.Strict as Map import Data.Maybe (fromMaybe, isNothing) -import Data.Monoid ((<>)) import System.Directory (setCurrentDirectory, getHomeDirectory, makeAbsolute) import XMonad import XMonad.Actions.DynamicWorkspaces diff --git a/XMonad/Actions/GridSelect.hs b/XMonad/Actions/GridSelect.hs index 6e2eb12d..4195a9bd 100644 --- a/XMonad/Actions/GridSelect.hs +++ b/XMonad/Actions/GridSelect.hs @@ -82,7 +82,6 @@ import Data.Maybe import Data.Bits import Data.Char import Data.Ord (comparing) -import Control.Applicative import Control.Monad.State import Control.Arrow import Data.List as L diff --git a/XMonad/Actions/ShowText.hs b/XMonad/Actions/ShowText.hs index 8826479e..9e2dcaf6 100644 --- a/XMonad/Actions/ShowText.hs +++ b/XMonad/Actions/ShowText.hs @@ -24,7 +24,7 @@ module XMonad.Actions.ShowText import Control.Monad (when) import Data.Map (Map,empty,insert,lookup) -import Data.Monoid (mempty, All) +import Data.Monoid (All) import Prelude hiding (lookup) import XMonad import XMonad.StackSet (current,screen) diff --git a/XMonad/Actions/TreeSelect.hs b/XMonad/Actions/TreeSelect.hs index 638a382e..8756c2e6 100644 --- a/XMonad/Actions/TreeSelect.hs +++ b/XMonad/Actions/TreeSelect.hs @@ -60,7 +60,6 @@ module XMonad.Actions.TreeSelect , treeselectAt ) where -import Control.Applicative import Control.Monad.Reader import Control.Monad.State import Data.List (find) diff --git a/XMonad/Actions/WorkspaceCursors.hs b/XMonad/Actions/WorkspaceCursors.hs index ce8f300b..1daa83d3 100644 --- a/XMonad/Actions/WorkspaceCursors.hs +++ b/XMonad/Actions/WorkspaceCursors.hs @@ -50,10 +50,8 @@ import XMonad(Typeable, Message, WorkspaceId, X, XState(windowset), fromMessage, sendMessage, windows, gets) import Control.Applicative (liftA2) import Control.Monad((<=<), guard, when) -import Data.Foldable(Foldable(foldMap), toList) +import Data.Foldable(toList) import Data.Maybe(fromJust, listToMaybe) -import Data.Monoid(Monoid(mappend, mconcat)) -import Data.Traversable(sequenceA) -- $usage -- diff --git a/XMonad/Config/Bluetile.hs b/XMonad/Config/Bluetile.hs index 7c20b816..454e6225 100644 --- a/XMonad/Config/Bluetile.hs +++ b/XMonad/Config/Bluetile.hs @@ -62,7 +62,6 @@ import qualified XMonad.StackSet as W import qualified Data.Map as M import System.Exit -import Data.Monoid import Control.Monad(when) -- $usage diff --git a/XMonad/Config/Dmwit.hs b/XMonad/Config/Dmwit.hs index 4a85ba61..cee26ecb 100644 --- a/XMonad/Config/Dmwit.hs +++ b/XMonad/Config/Dmwit.hs @@ -4,7 +4,6 @@ module XMonad.Config.Dmwit where -- system imports -import Control.Applicative import Control.Monad import Control.Monad.Trans import Data.Char diff --git a/XMonad/Hooks/DebugEvents.hs b/XMonad/Hooks/DebugEvents.hs index f3fe7ccc..5208b663 100644 --- a/XMonad/Hooks/DebugEvents.hs +++ b/XMonad/Hooks/DebugEvents.hs @@ -48,7 +48,6 @@ import Numeric (showHex) import System.Exit import System.IO import System.Process -import Control.Applicative -- | Event hook to dump all received events. You should probably not use this -- unconditionally; it will produce massive amounts of output. diff --git a/XMonad/Hooks/DynamicProperty.hs b/XMonad/Hooks/DynamicProperty.hs index 80195e9b..b6b60953 100644 --- a/XMonad/Hooks/DynamicProperty.hs +++ b/XMonad/Hooks/DynamicProperty.hs @@ -27,7 +27,6 @@ module XMonad.Hooks.DynamicProperty where import XMonad import Data.Monoid -import Control.Applicative import Control.Monad (when) -- | diff --git a/XMonad/Hooks/EwmhDesktops.hs b/XMonad/Hooks/EwmhDesktops.hs index d8c21333..2f494063 100644 --- a/XMonad/Hooks/EwmhDesktops.hs +++ b/XMonad/Hooks/EwmhDesktops.hs @@ -37,7 +37,6 @@ import Data.List import Data.Maybe import Data.Monoid import qualified Data.Map.Strict as M -import System.IO.Unsafe import XMonad import Control.Monad diff --git a/XMonad/Hooks/FadeWindows.hs b/XMonad/Hooks/FadeWindows.hs index 01d06792..25d416a1 100644 --- a/XMonad/Hooks/FadeWindows.hs +++ b/XMonad/Hooks/FadeWindows.hs @@ -61,8 +61,7 @@ import Control.Monad.Reader (ask ,asks) import Control.Monad.State (gets) import qualified Data.Map as M -import Data.Monoid hiding ((<>)) -import Data.Semigroup +import Data.Monoid import Graphics.X11.Xlib.Extras (Event(..)) diff --git a/XMonad/Hooks/Focus.hs b/XMonad/Hooks/Focus.hs index f5b534f1..304d8826 100644 --- a/XMonad/Hooks/Focus.hs +++ b/XMonad/Hooks/Focus.hs @@ -65,7 +65,6 @@ module XMonad.Hooks.Focus import Data.Maybe import Data.Monoid import qualified Data.Semigroup as S -import Control.Applicative import Control.Monad import Control.Monad.Reader import Control.Arrow hiding ((<+>)) @@ -74,7 +73,7 @@ import XMonad import qualified XMonad.StackSet as W import qualified XMonad.Util.ExtensibleState as XS import XMonad.Hooks.ManageHelpers (currentWs) -import XMonad.Hooks.EwmhDesktops (activated, NetActivated(..)) +import XMonad.Hooks.EwmhDesktops (activated) -- $main diff --git a/XMonad/Hooks/ManageDocks.hs b/XMonad/Hooks/ManageDocks.hs index f998a500..c9c7c6b0 100644 --- a/XMonad/Hooks/ManageDocks.hs +++ b/XMonad/Hooks/ManageDocks.hs @@ -40,8 +40,7 @@ import XMonad.Util.Types import XMonad.Util.WindowProperties (getProp32s) import XMonad.Util.XUtils (fi) import qualified XMonad.Util.ExtensibleState as XS -import Data.Monoid (All(..), mempty) -import Data.Functor((<$>)) +import Data.Monoid (All(..)) import qualified Data.Set as S import qualified Data.Map as M diff --git a/XMonad/Hooks/WallpaperSetter.hs b/XMonad/Hooks/WallpaperSetter.hs index 1c24dfa9..136bbcec 100644 --- a/XMonad/Hooks/WallpaperSetter.hs +++ b/XMonad/Hooks/WallpaperSetter.hs @@ -39,10 +39,7 @@ import Data.Char (isAlphaNum) import Data.Ord (comparing) import Control.Monad -import Control.Applicative import Data.Maybe -import Data.Monoid hiding ((<>)) -import Data.Semigroup -- $usage -- This module requires imagemagick and feh to be installed, as these are utilized diff --git a/XMonad/Hooks/XPropManage.hs b/XMonad/Hooks/XPropManage.hs index 1f94b92a..3a41bf98 100644 --- a/XMonad/Hooks/XPropManage.hs +++ b/XMonad/Hooks/XPropManage.hs @@ -20,7 +20,7 @@ module XMonad.Hooks.XPropManage ( import Control.Exception as E import Data.Char (chr) -import Data.Monoid (mconcat, Endo(..)) +import Data.Monoid (Endo(..)) import Control.Monad.Trans (lift) diff --git a/XMonad/Layout/BinarySpacePartition.hs b/XMonad/Layout/BinarySpacePartition.hs index c4219b61..8aa7c9e1 100644 --- a/XMonad/Layout/BinarySpacePartition.hs +++ b/XMonad/Layout/BinarySpacePartition.hs @@ -47,7 +47,6 @@ import qualified Data.Map as M import qualified Data.Set as S import Data.List ((\\), elemIndex, foldl') import Data.Maybe (fromMaybe, isNothing, isJust, mapMaybe, catMaybes) -import Control.Applicative import Control.Monad import Data.Ratio ((%)) diff --git a/XMonad/Layout/IndependentScreens.hs b/XMonad/Layout/IndependentScreens.hs index 2ef230bb..05ef8172 100644 --- a/XMonad/Layout/IndependentScreens.hs +++ b/XMonad/Layout/IndependentScreens.hs @@ -31,7 +31,6 @@ module XMonad.Layout.IndependentScreens ( -- for the screen stuff import Control.Applicative(liftA2) import Control.Arrow hiding ((|||)) -import Control.Monad import Data.List (nub, genericLength) import Graphics.X11.Xinerama import XMonad diff --git a/XMonad/Layout/Master.hs b/XMonad/Layout/Master.hs index b5668b6e..316a6e6f 100644 --- a/XMonad/Layout/Master.hs +++ b/XMonad/Layout/Master.hs @@ -26,7 +26,6 @@ module XMonad.Layout.Master ( import XMonad import qualified XMonad.StackSet as S import XMonad.Layout.LayoutModifier -import Control.Monad -- $usage -- You can use this module with the following in your @~\/.xmonad\/xmonad.hs@: diff --git a/XMonad/Layout/Mosaic.hs b/XMonad/Layout/Mosaic.hs index 8cfbcd5b..94cbc705 100644 --- a/XMonad/Layout/Mosaic.hs +++ b/XMonad/Layout/Mosaic.hs @@ -35,11 +35,9 @@ import XMonad(Typeable, import qualified XMonad.StackSet as W import Control.Arrow(second, first) import Control.Monad(mplus) -import Data.Foldable(Foldable,foldMap, sum) +import Data.Foldable(sum) import Data.Function(on) import Data.List(sortBy) -import Data.Monoid(Monoid,mempty, mappend, (<>)) -import Data.Semigroup -- $usage diff --git a/XMonad/Layout/SortedLayout.hs b/XMonad/Layout/SortedLayout.hs index b1ac1272..f57839b7 100644 --- a/XMonad/Layout/SortedLayout.hs +++ b/XMonad/Layout/SortedLayout.hs @@ -25,7 +25,6 @@ module XMonad.Layout.SortedLayout ) where import Control.Monad -import Data.Functor ((<$>)) import Data.List import XMonad diff --git a/XMonad/Layout/SubLayouts.hs b/XMonad/Layout/SubLayouts.hs index 1b1aa5f4..01655183 100644 --- a/XMonad/Layout/SubLayouts.hs +++ b/XMonad/Layout/SubLayouts.hs @@ -56,7 +56,6 @@ import Control.Monad(MonadPlus(mplus), foldM, guard, when, join) import Data.Function(on) import Data.List(nubBy, (\\), find) import Data.Maybe(isNothing, fromMaybe, listToMaybe, mapMaybe) -import Data.Traversable(sequenceA) import qualified XMonad as X import qualified XMonad.Layout.BoringWindows as B diff --git a/XMonad/Layout/TallMastersCombo.hs b/XMonad/Layout/TallMastersCombo.hs index f0f9168a..7f8702ee 100644 --- a/XMonad/Layout/TallMastersCombo.hs +++ b/XMonad/Layout/TallMastersCombo.hs @@ -49,19 +49,12 @@ module XMonad.Layout.TallMastersCombo ( import XMonad hiding (focus, (|||)) import XMonad.StackSet (Workspace(..),integrate',Stack(..)) import qualified XMonad.StackSet as W -import Data.Maybe (fromJust,isJust,fromMaybe) +import Data.Maybe (isJust) import Data.List (delete,find) -import Control.Monad (join, foldM) -import XMonad.Layout (Choose, ChangeLayout(..)) -import qualified XMonad.Layout as LL -import Data.Typeable -import XMonad.Layout.Simplest (Simplest(..)) -import XMonad.Layout hiding ((|||)) -import XMonad.Layout.Decoration -import XMonad.Layout.LayoutModifier -import XMonad.Layout.Tabbed (tabbed, fontName, shrinkText) -import Data.Maybe (fromJust,isJust) import Control.Monad (foldM) +import qualified XMonad.Layout as LL +import XMonad.Layout.Simplest (Simplest(..)) +import XMonad.Layout.Decoration --------------------------------------------------------------------------------- -- $usage diff --git a/XMonad/Prompt/Ssh.hs b/XMonad/Prompt/Ssh.hs index 801d97c2..6add5fd4 100644 --- a/XMonad/Prompt/Ssh.hs +++ b/XMonad/Prompt/Ssh.hs @@ -28,7 +28,6 @@ import System.Environment import Control.Exception as E import Control.Applicative (liftA2) -import Control.Monad import Data.Maybe import Data.List(elemIndex) diff --git a/XMonad/Prompt/Unicode.hs b/XMonad/Prompt/Unicode.hs index 418adc94..5a73fe96 100644 --- a/XMonad/Prompt/Unicode.hs +++ b/XMonad/Prompt/Unicode.hs @@ -29,9 +29,7 @@ import Data.Char import Data.Maybe import Data.Ord import Numeric -import System.Environment import System.IO -import System.IO.Unsafe import System.IO.Error import Control.Arrow import Data.List diff --git a/XMonad/Util/Font.hs b/XMonad/Util/Font.hs index e415d181..305f1ea6 100644 --- a/XMonad/Util/Font.hs +++ b/XMonad/Util/Font.hs @@ -35,10 +35,8 @@ module XMonad.Util.Font import XMonad import Foreign -import Control.Applicative import Control.Exception as E import Data.Maybe -import Data.Bits (shiftR) import Text.Printf (printf) #ifdef XFT diff --git a/XMonad/Util/Invisible.hs b/XMonad/Util/Invisible.hs index e1523166..faaeadf5 100644 --- a/XMonad/Util/Invisible.hs +++ b/XMonad/Util/Invisible.hs @@ -22,7 +22,6 @@ module XMonad.Util.Invisible ( , fromIMaybe ) where -import Control.Applicative import Control.Monad.Fail -- $usage diff --git a/XMonad/Util/Loggers.hs b/XMonad/Util/Loggers.hs index 6ae1fd5d..c0e42378 100644 --- a/XMonad/Util/Loggers.hs +++ b/XMonad/Util/Loggers.hs @@ -53,7 +53,6 @@ import XMonad.Util.NamedWindows (getName) import Control.Exception as E import Data.List (isPrefixOf, isSuffixOf) import Data.Maybe (fromMaybe) -import Data.Traversable (traverse) import System.Directory (getDirectoryContents) import System.IO import System.Locale diff --git a/XMonad/Util/PureX.hs b/XMonad/Util/PureX.hs index 988ad5e5..f35ca339 100644 --- a/XMonad/Util/PureX.hs +++ b/XMonad/Util/PureX.hs @@ -58,7 +58,7 @@ import Control.Monad.State import Control.Monad.Reader -- base -import Data.Semigroup (Semigroup(..), Any(..)) +import Data.Semigroup (Any(..)) import Control.Applicative (liftA2) -- }}} diff --git a/XMonad/Util/RemoteWindows.hs b/XMonad/Util/RemoteWindows.hs index 1530e08f..dd15b493 100644 --- a/XMonad/Util/RemoteWindows.hs +++ b/XMonad/Util/RemoteWindows.hs @@ -38,7 +38,6 @@ module XMonad.Util.RemoteWindows import XMonad import XMonad.Util.WindowProperties -import Data.Monoid import Data.Maybe import Control.Monad import System.Posix.Env diff --git a/XMonad/Util/Timer.hs b/XMonad/Util/Timer.hs index 259c1ed5..8a0e2216 100644 --- a/XMonad/Util/Timer.hs +++ b/XMonad/Util/Timer.hs @@ -20,7 +20,6 @@ module XMonad.Util.Timer ) where import XMonad -import Control.Applicative import Control.Concurrent import Data.Unique diff --git a/XMonad/Util/WorkspaceCompare.hs b/XMonad/Util/WorkspaceCompare.hs index 7aabb1d2..ccfe6f70 100644 --- a/XMonad/Util/WorkspaceCompare.hs +++ b/XMonad/Util/WorkspaceCompare.hs @@ -27,7 +27,6 @@ import XMonad import qualified XMonad.StackSet as S import Data.List import Data.Maybe -import Data.Monoid (mconcat) import XMonad.Actions.PhysicalScreens (ScreenComparator(ScreenComparator), getScreenIdAndRectangle, screenComparatorById) import Data.Function (on)