Remove unnecessary imports of Control.Applicative

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

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@:

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

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
 
 

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

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)

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))

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

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))

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

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

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, (\\))

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

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

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
 

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

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

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)

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)

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

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

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@:

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)
 
 

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

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)

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)

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

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
+-- (For convenience, you can use '<$>' instead of \'.\' or \'$\' in hard to read
--- use instead of \'.\' or \'$\' in hard to read formatting lines.
+-- formatting lines.
 -- For example:
 --
 -- > myLogHook = dynamicLogWithPP def {

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
 

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 )
 

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

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)
 

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

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'.

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)