Avoid redundant use of IO monad

2 files changed, 11 insertions, 12 deletions

diff --git a/src/Xmobar/Run/Loop.hs b/src/Xmobar/Run/Loop.hs
index bda41ff..6775961 100644
--- a/src/Xmobar/Run/Loop.hs
+++ b/src/Xmobar/Run/Loop.hs
@@ -57,7 +57,7 @@ type LoopFunction = TMVar SignalType -> TVar [String] -> IO ()
 
 loop :: Config -> LoopFunction -> IO ()
 loop conf looper = withDeferSignals $ do
-  cls <- mapM (parseTemplate (commands conf) (sepChar conf))
+  let cls = map (parseTemplate (commands conf) (sepChar conf))
                 (splitTemplate (alignSep conf) (template conf))
   let confSig = unSignalChan (signal conf)
   sig <- maybe newEmptyTMVarIO pure confSig
diff --git a/src/Xmobar/Run/Template.hs b/src/Xmobar/Run/Template.hs
index 68feacb..0e066dc 100644
--- a/src/Xmobar/Run/Template.hs
+++ b/src/Xmobar/Run/Template.hs
@@ -50,21 +50,20 @@ templateParser s = many $ templateStringParser s
 
 -- | Actually runs the template parsers over a (segment of) a template
 -- string, returning a list of runnables with their prefix and suffix.
-parseTemplate :: [Runnable] -> String -> String -> IO [(Runnable,String,String)]
+parseTemplate :: [Runnable] -> String -> String -> [(Runnable,String,String)]
 parseTemplate c sepChar s =
-    do str <- case parse (templateParser sepChar) "" s of
-                Left _  -> return [("", s, "")]
-                Right x -> return x
-       let cl = map alias c
-           m  = Map.fromList $ zip cl c
-       return $ combine c m str
+    let str = case parse (templateParser sepChar) "" s of
+             Left _  -> [("", s, "")]
+             Right x -> x
+        cl = map alias c
+        m  = Map.fromList $ zip cl c
+    in combine m str
 
 -- | Given a finite "Map" and a parsed template produce the resulting
 -- output string.
-combine :: [Runnable] -> Map.Map String Runnable -> [(String, String, String)]
-           -> [(Runnable,String,String)]
-combine _ _ [] = []
-combine c m ((ts,s,ss):xs) = (com, s, ss) : combine c m xs
+combine :: Map.Map String Runnable -> [(String, String, String)] -> [(Runnable,String,String)]
+combine _ [] = []
+combine m ((ts,s,ss):xs) = (com, s, ss) : combine m xs
     where com  = Map.findWithDefault dflt ts m
           dflt = Run $ Com ts [] [] 10