From f3024e677977fa57e655f60c0c8054c5ea2cd457 Mon Sep 17 00:00:00 2001 From: slotThe Date: Tue, 8 Oct 2019 10:21:15 +0200 Subject: [PATCH] Remove unnecessary imports of Control.Applicative --- XMonad/Actions/FloatSnap.hs | 1 - XMonad/Actions/MessageFeedback.hs | 2 +- XMonad/Actions/Minimize.hs | 1 - XMonad/Actions/SwapPromote.hs | 1 - XMonad/Actions/WindowBringer.hs | 1 - XMonad/Actions/WindowNavigation.hs | 1 - XMonad/Actions/WorkspaceCursors.hs | 1 - XMonad/Hooks/EwmhDesktops.hs | 1 - XMonad/Hooks/InsertPosition.hs | 1 - XMonad/Hooks/PositionStoreHooks.hs | 1 - XMonad/Hooks/ToggleHook.hs | 1 - XMonad/Hooks/UrgencyHook.hs | 1 - XMonad/Hooks/WorkspaceByPos.hs | 1 - XMonad/Layout/BoringWindows.hs | 1 - XMonad/Layout/DecorationAddons.hs | 1 - XMonad/Layout/Groups.hs | 2 +- XMonad/Layout/IfMax.hs | 1 - XMonad/Layout/IndependentScreens.hs | 2 +- XMonad/Layout/LayoutHints.hs | 1 - XMonad/Layout/LimitWindows.hs | 1 - XMonad/Layout/MessageControl.hs | 1 - XMonad/Layout/MouseResizableTile.hs | 1 - XMonad/Layout/NoBorders.hs | 1 - XMonad/Layout/StateFull.hs | 2 +- XMonad/Layout/SubLayouts.hs | 1 - XMonad/Prompt.hs | 1 - XMonad/Util/ExclusiveScratchpads.hs | 1 - XMonad/Util/Loggers.hs | 7 ++----- XMonad/Util/NamedActions.hs | 2 -- XMonad/Util/NamedWindows.hs | 1 - XMonad/Util/SessionStart.hs | 1 - XMonad/Util/Stack.hs | 2 +- XMonad/Util/StringProp.hs | 1 - XMonad/Util/WindowState.hs | 1 - tests/Selective.hs | 1 - 35 files changed, 7 insertions(+), 40 deletions(-) diff --git a/XMonad/Actions/FloatSnap.hs b/XMonad/Actions/FloatSnap.hs index baf511f3..df226b39 100644 --- a/XMonad/Actions/FloatSnap.hs +++ b/XMonad/Actions/FloatSnap.hs @@ -27,7 +27,6 @@ module XMonad.Actions.FloatSnap ( ifClick') where import XMonad -import Control.Applicative((<$>)) import Data.List (sort) import Data.Maybe (listToMaybe,fromJust,isNothing) import qualified XMonad.StackSet as W diff --git a/XMonad/Actions/MessageFeedback.hs b/XMonad/Actions/MessageFeedback.hs index 1717f57c..d332d43c 100644 --- a/XMonad/Actions/MessageFeedback.hs +++ b/XMonad/Actions/MessageFeedback.hs @@ -57,7 +57,7 @@ import XMonad.Operations ( updateLayout, windowBracket, modifyWindowSet ) import Data.Maybe ( isJust ) import Control.Monad ( void ) import Control.Monad.State ( gets ) -import Control.Applicative ( (<$>), liftA2 ) +import Control.Applicative ( liftA2 ) -- $usage -- You can use this module with the following in your @~\/.xmonad\/xmonad.hs@: diff --git a/XMonad/Actions/Minimize.hs b/XMonad/Actions/Minimize.hs index 5a1ea389..73306f6c 100644 --- a/XMonad/Actions/Minimize.hs +++ b/XMonad/Actions/Minimize.hs @@ -43,7 +43,6 @@ import XMonad.Util.Minimize import XMonad.Util.WindowProperties (getProp32) import Foreign.C.Types (CLong) -import Control.Applicative((<$>)) import Control.Monad (join) import Data.Maybe (fromMaybe, listToMaybe) import qualified Data.List as L diff --git a/XMonad/Actions/SwapPromote.hs b/XMonad/Actions/SwapPromote.hs index e8fc41aa..56a32e89 100644 --- a/XMonad/Actions/SwapPromote.hs +++ b/XMonad/Actions/SwapPromote.hs @@ -65,7 +65,6 @@ import qualified Data.Set as S import Data.List import Data.Maybe import Control.Arrow -import Control.Applicative ((<$>),(<*>)) import Control.Monad diff --git a/XMonad/Actions/WindowBringer.hs b/XMonad/Actions/WindowBringer.hs index 49aa3226..643dd6f9 100644 --- a/XMonad/Actions/WindowBringer.hs +++ b/XMonad/Actions/WindowBringer.hs @@ -24,7 +24,6 @@ module XMonad.Actions.WindowBringer ( windowMap, windowAppMap, windowMap', bringWindow, actionMenu ) where -import Control.Applicative((<$>)) import qualified Data.Map as M import qualified XMonad.StackSet as W diff --git a/XMonad/Actions/WindowNavigation.hs b/XMonad/Actions/WindowNavigation.hs index af277335..81273916 100644 --- a/XMonad/Actions/WindowNavigation.hs +++ b/XMonad/Actions/WindowNavigation.hs @@ -43,7 +43,6 @@ import XMonad import XMonad.Util.Types (Direction2D(..)) import qualified XMonad.StackSet as W -import Control.Applicative ((<$>)) import Control.Arrow (second) import Data.IORef import Data.List (sortBy) diff --git a/XMonad/Actions/WorkspaceCursors.hs b/XMonad/Actions/WorkspaceCursors.hs index eb7d7d7f..a44c5ec2 100644 --- a/XMonad/Actions/WorkspaceCursors.hs +++ b/XMonad/Actions/WorkspaceCursors.hs @@ -49,7 +49,6 @@ import XMonad.Layout.LayoutModifier(ModifiedLayout(..), import XMonad(Typeable, Message, WorkspaceId, X, XState(windowset), fromMessage, sendMessage, windows, gets) import Control.Monad((<=<), guard, liftM, liftM2, when) -import Control.Applicative((<$>)) import Data.Foldable(Foldable(foldMap), toList) import Data.Maybe(fromJust, listToMaybe) import Data.Monoid(Monoid(mappend, mconcat)) diff --git a/XMonad/Hooks/EwmhDesktops.hs b/XMonad/Hooks/EwmhDesktops.hs index 97c2bd3f..cc021795 100644 --- a/XMonad/Hooks/EwmhDesktops.hs +++ b/XMonad/Hooks/EwmhDesktops.hs @@ -25,7 +25,6 @@ module XMonad.Hooks.EwmhDesktops ( ) where import Codec.Binary.UTF8.String (encode) -import Control.Applicative((<$>)) import Data.List import Data.Maybe import Data.Monoid diff --git a/XMonad/Hooks/InsertPosition.hs b/XMonad/Hooks/InsertPosition.hs index 0c6230c0..ab123d3f 100644 --- a/XMonad/Hooks/InsertPosition.hs +++ b/XMonad/Hooks/InsertPosition.hs @@ -22,7 +22,6 @@ module XMonad.Hooks.InsertPosition ( import XMonad(ManageHook, MonadReader(ask)) import qualified XMonad.StackSet as W -import Control.Applicative((<$>)) import Data.Maybe(fromMaybe) import Data.List(find) import Data.Monoid(Endo(Endo)) diff --git a/XMonad/Hooks/PositionStoreHooks.hs b/XMonad/Hooks/PositionStoreHooks.hs index e32c3c91..7d02fb52 100644 --- a/XMonad/Hooks/PositionStoreHooks.hs +++ b/XMonad/Hooks/PositionStoreHooks.hs @@ -40,7 +40,6 @@ import XMonad.Hooks.ManageDocks import XMonad.Layout.Decoration import System.Random(randomRIO) -import Control.Applicative((<$>)) import Control.Monad(when) import Data.Maybe import Data.Monoid diff --git a/XMonad/Hooks/ToggleHook.hs b/XMonad/Hooks/ToggleHook.hs index a497678c..225dad47 100644 --- a/XMonad/Hooks/ToggleHook.hs +++ b/XMonad/Hooks/ToggleHook.hs @@ -42,7 +42,6 @@ import XMonad import qualified XMonad.Util.ExtensibleState as XS import Control.Monad (join,guard) -import Control.Applicative ((<$>)) import Control.Arrow (first, second) import Data.Map diff --git a/XMonad/Hooks/UrgencyHook.hs b/XMonad/Hooks/UrgencyHook.hs index f9360c51..964d46c1 100644 --- a/XMonad/Hooks/UrgencyHook.hs +++ b/XMonad/Hooks/UrgencyHook.hs @@ -81,7 +81,6 @@ import XMonad.Util.NamedWindows (getName) import XMonad.Util.Timer (TimerId, startTimer, handleTimer) import XMonad.Util.WindowProperties (getProp32) -import Control.Applicative ((<$>)) import Control.Monad (when) import Data.Bits (testBit) import Data.List (delete, (\\)) diff --git a/XMonad/Hooks/WorkspaceByPos.hs b/XMonad/Hooks/WorkspaceByPos.hs index 9d577f5b..0c58bfc2 100644 --- a/XMonad/Hooks/WorkspaceByPos.hs +++ b/XMonad/Hooks/WorkspaceByPos.hs @@ -25,7 +25,6 @@ import qualified XMonad.StackSet as W import XMonad.Util.XUtils (fi) import Data.Maybe -import Control.Applicative((<$>)) import Control.Monad.Error ((<=<),guard,lift,runErrorT,throwError) -- $usage diff --git a/XMonad/Layout/BoringWindows.hs b/XMonad/Layout/BoringWindows.hs index cbea6a21..4d367632 100644 --- a/XMonad/Layout/BoringWindows.hs +++ b/XMonad/Layout/BoringWindows.hs @@ -34,7 +34,6 @@ import XMonad.Layout.LayoutModifier(ModifiedLayout(..), LayoutModifier(handleMessOrMaybeModifyIt, redoLayout)) import XMonad(Typeable, LayoutClass, Message, X, fromMessage, sendMessage, windows, withFocused, Window) -import Control.Applicative((<$>)) import Data.List((\\), union) import Data.Maybe(fromMaybe, listToMaybe, maybeToList) import qualified Data.Map as M diff --git a/XMonad/Layout/DecorationAddons.hs b/XMonad/Layout/DecorationAddons.hs index b8916be4..b77a4d4f 100644 --- a/XMonad/Layout/DecorationAddons.hs +++ b/XMonad/Layout/DecorationAddons.hs @@ -30,7 +30,6 @@ import XMonad.Hooks.ManageDocks import XMonad.Util.Font import XMonad.Util.PositionStore -import Control.Applicative((<$>)) import Data.Maybe import qualified Data.Set as S diff --git a/XMonad/Layout/Groups.hs b/XMonad/Layout/Groups.hs index d2aa9725..7eda99ca 100644 --- a/XMonad/Layout/Groups.hs +++ b/XMonad/Layout/Groups.hs @@ -61,7 +61,7 @@ import XMonad.Util.Stack import Data.Maybe (isJust, isNothing, fromMaybe, catMaybes, fromJust) import Data.List ((\\)) import Control.Arrow ((>>>)) -import Control.Applicative ((<$>),(<|>),(<$)) +import Control.Applicative ((<|>)) import Control.Monad (forM,void) -- $usage diff --git a/XMonad/Layout/IfMax.hs b/XMonad/Layout/IfMax.hs index 4d20282e..1ca8d4a7 100644 --- a/XMonad/Layout/IfMax.hs +++ b/XMonad/Layout/IfMax.hs @@ -23,7 +23,6 @@ module XMonad.Layout.IfMax , ifMax ) where -import Control.Applicative((<$>)) import Control.Arrow import qualified Data.List as L import qualified Data.Map as M diff --git a/XMonad/Layout/IndependentScreens.hs b/XMonad/Layout/IndependentScreens.hs index a2a9c00f..656cfd1a 100644 --- a/XMonad/Layout/IndependentScreens.hs +++ b/XMonad/Layout/IndependentScreens.hs @@ -29,7 +29,7 @@ module XMonad.Layout.IndependentScreens ( ) where -- for the screen stuff -import Control.Applicative((<*), liftA2) +import Control.Applicative(liftA2) import Control.Arrow hiding ((|||)) import Control.Monad import Data.List (nub, genericLength) diff --git a/XMonad/Layout/LayoutHints.hs b/XMonad/Layout/LayoutHints.hs index a5258b13..35f1619c 100644 --- a/XMonad/Layout/LayoutHints.hs +++ b/XMonad/Layout/LayoutHints.hs @@ -35,7 +35,6 @@ import XMonad.Layout.Decoration(isInStack) import XMonad.Layout.LayoutModifier(ModifiedLayout(..), LayoutModifier(modifyLayout, redoLayout, modifierDescription)) import XMonad.Util.Types(Direction2D(..)) -import Control.Applicative((<$>)) import Control.Arrow(Arrow((***), first, second)) import Control.Monad(join) import Data.Function(on) diff --git a/XMonad/Layout/LimitWindows.hs b/XMonad/Layout/LimitWindows.hs index b0f89f8d..a1c4d291 100644 --- a/XMonad/Layout/LimitWindows.hs +++ b/XMonad/Layout/LimitWindows.hs @@ -38,7 +38,6 @@ import XMonad.Layout.LayoutModifier import XMonad import qualified XMonad.StackSet as W import Control.Monad((<=<),guard) -import Control.Applicative((<$>)) import Data.Maybe(fromJust) -- $usage diff --git a/XMonad/Layout/MessageControl.hs b/XMonad/Layout/MessageControl.hs index 8f3f4424..ff125a66 100644 --- a/XMonad/Layout/MessageControl.hs +++ b/XMonad/Layout/MessageControl.hs @@ -32,7 +32,6 @@ import XMonad.StackSet (Workspace(..)) import XMonad.Layout.LayoutModifier (LayoutModifier(..), ModifiedLayout(..)) import Data.Typeable (Typeable) -import Control.Applicative ((<$>)) import Control.Arrow (second) -- $usage diff --git a/XMonad/Layout/MouseResizableTile.hs b/XMonad/Layout/MouseResizableTile.hs index 277dfde4..020d5b67 100644 --- a/XMonad/Layout/MouseResizableTile.hs +++ b/XMonad/Layout/MouseResizableTile.hs @@ -36,7 +36,6 @@ module XMonad.Layout.MouseResizableTile ( import XMonad hiding (tile, splitVertically, splitHorizontallyBy) import qualified XMonad.StackSet as W import XMonad.Util.XUtils -import Control.Applicative((<$>)) -- $usage -- You can use this module with the following in your @~\/.xmonad\/xmonad.hs@: diff --git a/XMonad/Layout/NoBorders.hs b/XMonad/Layout/NoBorders.hs index 0997ed69..18f0a6d4 100644 --- a/XMonad/Layout/NoBorders.hs +++ b/XMonad/Layout/NoBorders.hs @@ -42,7 +42,6 @@ import Data.List import Data.Monoid import qualified Data.Map as M import Data.Function (on) -import Control.Applicative ((<$>),(<*>),pure) import Control.Monad (guard) diff --git a/XMonad/Layout/StateFull.hs b/XMonad/Layout/StateFull.hs index ceacad1c..07c38254 100644 --- a/XMonad/Layout/StateFull.hs +++ b/XMonad/Layout/StateFull.hs @@ -34,7 +34,7 @@ import qualified XMonad.StackSet as W import XMonad.Util.Stack (findZ) import Data.Maybe (fromMaybe) -import Control.Applicative ((<|>),(<$>)) +import Control.Applicative ((<|>)) import Control.Monad (join) -- $Usage diff --git a/XMonad/Layout/SubLayouts.hs b/XMonad/Layout/SubLayouts.hs index 58a7edc6..bf04ddbe 100644 --- a/XMonad/Layout/SubLayouts.hs +++ b/XMonad/Layout/SubLayouts.hs @@ -51,7 +51,6 @@ import XMonad.Layout.WindowNavigation(Navigate(Apply)) import XMonad.Util.Invisible(Invisible(..)) import XMonad.Util.Types(Direction2D(..)) import XMonad hiding (def) -import Control.Applicative((<$>),(<*)) import Control.Arrow(Arrow(second, (&&&))) import Control.Monad(MonadPlus(mplus), foldM, guard, when, join) import Data.Function(on) diff --git a/XMonad/Prompt.hs b/XMonad/Prompt.hs index 88fedfe9..95c935e1 100644 --- a/XMonad/Prompt.hs +++ b/XMonad/Prompt.hs @@ -98,7 +98,6 @@ import XMonad.Util.Types import XMonad.Util.XSelection (getSelection) import Codec.Binary.UTF8.String (decodeString,isUTF8Encoded) -import Control.Applicative ((<$>)) import Control.Arrow (first, second, (&&&), (***)) import Control.Concurrent (threadDelay) import Control.Exception.Extensible as E hiding (handle) diff --git a/XMonad/Util/ExclusiveScratchpads.hs b/XMonad/Util/ExclusiveScratchpads.hs index b734912f..061a0fc8 100644 --- a/XMonad/Util/ExclusiveScratchpads.hs +++ b/XMonad/Util/ExclusiveScratchpads.hs @@ -36,7 +36,6 @@ module XMonad.Util.ExclusiveScratchpads ( customFloating ) where -import Control.Applicative ((<$>)) import Control.Monad ((<=<),filterM,liftM2) import Data.Monoid (appEndo) import XMonad diff --git a/XMonad/Util/Loggers.hs b/XMonad/Util/Loggers.hs index c613d699..d627b937 100644 --- a/XMonad/Util/Loggers.hs +++ b/XMonad/Util/Loggers.hs @@ -41,8 +41,6 @@ module XMonad.Util.Loggers ( , shortenL , dzenColorL, xmobarColorL - , (<$>) - ) where import XMonad (liftIO) @@ -52,7 +50,6 @@ import XMonad.Hooks.DynamicLog import XMonad.Util.Font (Align (..)) import XMonad.Util.NamedWindows (getName) -import Control.Applicative ((<$>)) import Control.Exception as E import Data.List (isPrefixOf, isSuffixOf) import Data.Maybe (fromMaybe) @@ -189,8 +186,8 @@ logCurrent = withWindowSet $ return . Just . W.currentTag -- $format -- Combine logger formatting functions to make your -- 'XMonad.Hooks.DynamicLog.ppExtras' more colorful and readable. --- (For convenience this module exports 'Control.Applicative.<$>' to --- use instead of \'.\' or \'$\' in hard to read formatting lines. +-- (For convenience, you can use '<$>' instead of \'.\' or \'$\' in hard to read +-- formatting lines. -- For example: -- -- > myLogHook = dynamicLogWithPP def { diff --git a/XMonad/Util/NamedActions.hs b/XMonad/Util/NamedActions.hs index 7b8012c1..425751dd 100644 --- a/XMonad/Util/NamedActions.hs +++ b/XMonad/Util/NamedActions.hs @@ -53,8 +53,6 @@ import Data.Bits(Bits((.&.), complement)) import Data.List (groupBy) import System.Exit(ExitCode(ExitSuccess), exitWith) -import Control.Applicative ((<*>)) - import qualified Data.Map as M import qualified XMonad.StackSet as W diff --git a/XMonad/Util/NamedWindows.hs b/XMonad/Util/NamedWindows.hs index 3dfaa43e..82783dac 100644 --- a/XMonad/Util/NamedWindows.hs +++ b/XMonad/Util/NamedWindows.hs @@ -23,7 +23,6 @@ module XMonad.Util.NamedWindows ( unName ) where -import Control.Applicative ( (<$>) ) import Control.Exception.Extensible as E import Data.Maybe ( fromMaybe, listToMaybe ) diff --git a/XMonad/Util/SessionStart.hs b/XMonad/Util/SessionStart.hs index 807807ec..f5f7b13d 100644 --- a/XMonad/Util/SessionStart.hs +++ b/XMonad/Util/SessionStart.hs @@ -23,7 +23,6 @@ module XMonad.Util.SessionStart where import Control.Monad (when) -import Control.Applicative ((<$>)) import XMonad import qualified XMonad.Util.ExtensibleState as XS diff --git a/XMonad/Util/Stack.hs b/XMonad/Util/Stack.hs index 953de723..b774bc17 100644 --- a/XMonad/Util/Stack.hs +++ b/XMonad/Util/Stack.hs @@ -80,7 +80,7 @@ module XMonad.Util.Stack ( -- * Usage ) where import qualified XMonad.StackSet as W -import Control.Applicative ((<|>),(<$>),(<$)) +import Control.Applicative ((<|>)) import Control.Monad (guard,liftM) import Data.List (sortBy) diff --git a/XMonad/Util/StringProp.hs b/XMonad/Util/StringProp.hs index 2cf26d79..46249074 100644 --- a/XMonad/Util/StringProp.hs +++ b/XMonad/Util/StringProp.hs @@ -21,7 +21,6 @@ module XMonad.Util.StringProp ( import XMonad import Control.Monad(liftM) -import Control.Applicative((<$>)) import Foreign.C.String (castCCharToChar,castCharToCChar) type StringProp = String diff --git a/XMonad/Util/WindowState.hs b/XMonad/Util/WindowState.hs index e0c38c81..7046369b 100644 --- a/XMonad/Util/WindowState.hs +++ b/XMonad/Util/WindowState.hs @@ -27,7 +27,6 @@ import XMonad hiding (get, put, modify) import Control.Monad.Reader(ReaderT(..)) import Control.Monad.State.Class import Data.Typeable (typeOf) -import Control.Applicative((<$>), Applicative) -- $usage -- -- This module allow to store state data with some 'Window'. diff --git a/tests/Selective.hs b/tests/Selective.hs index db00563a..cdef57a0 100644 --- a/tests/Selective.hs +++ b/tests/Selective.hs @@ -8,7 +8,6 @@ module Selective where import XMonad.Layout.LimitWindows import XMonad.StackSet hiding (focusUp, focusDown, filter) -import Control.Applicative ((<$>)) import Test.QuickCheck import Control.Arrow (second)