From 3adb47235f9e08700e962132005296d6fd10a393 Mon Sep 17 00:00:00 2001
From: Tomas Janousek <tomi@nomi.cz>
Date: Mon, 2 May 2022 00:06:59 +0100
Subject: [PATCH] Apply hlint 3.4 hints

---
 XMonad/Actions/GroupNavigation.hs   | 4 ++--
 XMonad/Actions/WorkspaceCursors.hs  | 2 +-
 XMonad/Layout/Mosaic.hs             | 2 +-
 XMonad/Layout/MouseResizableTile.hs | 3 ++-
 XMonad/Layout/SubLayouts.hs         | 2 +-
 5 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/XMonad/Actions/GroupNavigation.hs b/XMonad/Actions/GroupNavigation.hs
index 8033397f..ef77f7b3 100644
--- a/XMonad/Actions/GroupNavigation.hs
+++ b/XMonad/Actions/GroupNavigation.hs
@@ -43,7 +43,7 @@ import qualified Data.Sequence as Seq
 import qualified Data.Set as Set
 import Graphics.X11.Types
 import GHC.Generics
-import Prelude hiding (concatMap, drop, elem, filter, null, reverse)
+import Prelude hiding (drop, elem, filter, null, reverse)
 import XMonad.Core
 import XMonad.ManageHook
 import XMonad.Operations (windows, withFocused)
@@ -224,7 +224,7 @@ isOnAnyVisibleWS :: Query Bool
 isOnAnyVisibleWS = do
   w <- ask
   ws <- liftX $ gets windowset
-  let allVisible = concat $ maybe [] SS.integrate . SS.stack . SS.workspace <$> SS.current ws:SS.visible ws
+  let allVisible = concatMap (maybe [] SS.integrate . SS.stack . SS.workspace) (SS.current ws:SS.visible ws)
       visibleWs = w `elem` allVisible
       unfocused = Just w /= SS.peek ws
   return $ visibleWs && unfocused
diff --git a/XMonad/Actions/WorkspaceCursors.hs b/XMonad/Actions/WorkspaceCursors.hs
index 0e0d7b94..6f3f1693 100644
--- a/XMonad/Actions/WorkspaceCursors.hs
+++ b/XMonad/Actions/WorkspaceCursors.hs
@@ -212,4 +212,4 @@ instance LayoutModifier WorkspaceCursors a where
         return (arrs,WorkspaceCursors <$> focusTo cws cs)
 
     handleMess (WorkspaceCursors cs) m =
-        sequenceA $ fmap WorkspaceCursors . ($ cs) . unWrap <$> fromMessage m
+        traverse (fmap WorkspaceCursors . ($ cs) . unWrap) (fromMessage m)
diff --git a/XMonad/Layout/Mosaic.hs b/XMonad/Layout/Mosaic.hs
index d7e5d712..8c291e04 100644
--- a/XMonad/Layout/Mosaic.hs
+++ b/XMonad/Layout/Mosaic.hs
@@ -111,7 +111,7 @@ instance LayoutClass Mosaic a where
         nextIx (ov,ix,mix)
                 | mix <= 0 || ov = fromIntegral $ nls `div` 2
                 | otherwise = max 0 $ (*fi (pred nls)) $ min 1 $ ix / fi mix
-        rect = rects !! maybe (nls `div` 2) round (nextIx <$> state)
+        rect = rects !! maybe (nls `div` 2) (round . nextIx) state
         state' = fmap (\x@(ov,_,_) -> (ov,nextIx x,pred nls)) state
                     `mplus` Just (True,fromIntegral nls / 2,pred nls)
         ss' = maybe ss (const ss `either` const ssExt) $ zipRemain ss ssExt
diff --git a/XMonad/Layout/MouseResizableTile.hs b/XMonad/Layout/MouseResizableTile.hs
index 29213f7b..d8bd3283 100644
--- a/XMonad/Layout/MouseResizableTile.hs
+++ b/XMonad/Layout/MouseResizableTile.hs
@@ -35,6 +35,7 @@ module XMonad.Layout.MouseResizableTile (
                                    ) where
 
 import XMonad hiding (tile, splitVertically, splitHorizontallyBy)
+import XMonad.Prelude
 import qualified XMonad.StackSet as W
 import XMonad.Util.XUtils
 import Graphics.X11 as X
@@ -146,7 +147,7 @@ instance LayoutClass MouseResizableTile Window where
                                             (rightFracs st ++ repeat (slaveFrac st)) sr' num drg
             rects' = map (mirrorAdjust id mirrorRect . sanitizeRectangle sr') rects
         mapM_ deleteDragger $ draggers st
-        (draggerWrs, newDraggers) <- unzip <$> mapM
+        (draggerWrs, newDraggers) <- mapAndUnzipM
                                         (createDragger sr . adjustForMirror (isMirrored st))
                                         preparedDraggers
         return (draggerWrs ++ zip wins rects', Just $ st { draggers = newDraggers,
diff --git a/XMonad/Layout/SubLayouts.hs b/XMonad/Layout/SubLayouts.hs
index 1a590f97..f0a2f40a 100644
--- a/XMonad/Layout/SubLayouts.hs
+++ b/XMonad/Layout/SubLayouts.hs
@@ -397,7 +397,7 @@ instance forall l. (Read (l Window), Show (l Window), LayoutClass l Window) => L
             in fgs $ nxsAdd $ M.insert x zs $ M.delete yf gs
 
 
-        | otherwise = join <$> sequenceA (catchLayoutMess <$> fromMessage m)
+        | otherwise = join <$> traverse catchLayoutMess (fromMessage m)
      where gs = toGroups sls
            fgs gs' = do
                 st <- currentStack