summaryrefslogtreecommitdiff
path: root/src/Utility
diff options
context:
space:
mode:
authorMario Lang2015-09-13 00:46:49 +0200
committerJoey Hess2015-09-13 13:21:41 -0400
commitb84c9bbb7c9db688118ad756c1c43ef034fd98fb (patch)
tree61d50f50f58714e9df2390c337fa7bb2ff34d3ea /src/Utility
parent2af70d4ac7ff25a3e596de195abe40db46c74074 (diff)
Follow some hlint suggestions.
Diffstat (limited to 'src/Utility')
-rw-r--r--src/Utility/Exception.hs5
-rw-r--r--src/Utility/Misc.hs2
-rw-r--r--src/Utility/Process.hs8
-rw-r--r--src/Utility/Scheduled.hs2
-rw-r--r--src/Utility/Table.hs2
5 files changed, 6 insertions, 13 deletions
diff --git a/src/Utility/Exception.hs b/src/Utility/Exception.hs
index 9d4236c4..a1f96615 100644
--- a/src/Utility/Exception.hs
+++ b/src/Utility/Exception.hs
@@ -36,10 +36,7 @@ catchBoolIO = catchDefaultIO False
{- Catches IO errors and returns a Maybe -}
catchMaybeIO :: MonadCatch m => m a -> m (Maybe a)
-catchMaybeIO a = do
- catchDefaultIO Nothing $ do
- v <- a
- return (Just v)
+catchMaybeIO a = catchDefaultIO Nothing $ a >>= (return . Just)
{- Catches IO errors and returns a default value. -}
catchDefaultIO :: MonadCatch m => a -> m a -> m a
diff --git a/src/Utility/Misc.hs b/src/Utility/Misc.hs
index 45d5a063..ebb42576 100644
--- a/src/Utility/Misc.hs
+++ b/src/Utility/Misc.hs
@@ -136,7 +136,7 @@ hGetSomeString h sz = do
- if this reap gets there first. -}
reapZombies :: IO ()
#ifndef mingw32_HOST_OS
-reapZombies = do
+reapZombies =
-- throws an exception when there are no child processes
catchDefaultIO Nothing (getAnyProcessStatus False True)
>>= maybe (return ()) (const reapZombies)
diff --git a/src/Utility/Process.hs b/src/Utility/Process.hs
index 469f7659..bd179d09 100644
--- a/src/Utility/Process.hs
+++ b/src/Utility/Process.hs
@@ -171,7 +171,7 @@ createBackgroundProcess p a = a =<< createProcess p
-- returns a transcript combining its stdout and stderr, and
-- whether it succeeded or failed.
processTranscript :: String -> [String] -> (Maybe String) -> IO (String, Bool)
-processTranscript cmd opts input = processTranscript' cmd opts Nothing input
+processTranscript cmd opts = processTranscript' cmd opts Nothing
processTranscript' :: String -> [String] -> Maybe [(String, String)] -> (Maybe String) -> IO (String, Bool)
processTranscript' cmd opts environ input = do
@@ -347,11 +347,7 @@ processHandle (_, _, _, pid) = pid
-- | Debugging trace for a CreateProcess.
debugProcess :: CreateProcess -> IO ()
-debugProcess p = do
- debugM "Utility.Process" $ unwords
- [ action ++ ":"
- , showCmd p
- ]
+debugProcess p = debugM "Utility.Process" $ unwords [action ++ ":", showCmd p]
where
action
| piped (std_in p) && piped (std_out p) = "chat"
diff --git a/src/Utility/Scheduled.hs b/src/Utility/Scheduled.hs
index b3813323..5e813d4a 100644
--- a/src/Utility/Scheduled.hs
+++ b/src/Utility/Scheduled.hs
@@ -286,7 +286,7 @@ fromScheduledTime AnyTime = "any time"
fromScheduledTime (SpecificTime h m) =
show h' ++ (if m > 0 then ":" ++ pad 2 (show m) else "") ++ " " ++ ampm
where
- pad n s = take (n - length s) (repeat '0') ++ s
+ pad n s = replicate (n - length s) '0' ++ s
(h', ampm)
| h == 0 = (12, "AM")
| h < 12 = (h, "AM")
diff --git a/src/Utility/Table.hs b/src/Utility/Table.hs
index 20adf40d..6d4c045b 100644
--- a/src/Utility/Table.hs
+++ b/src/Utility/Table.hs
@@ -26,4 +26,4 @@ formatTable table = map (\r -> unwords (map pad (zip r colsizes))) table
sumcols (map (map length) table)
sumcols [] = repeat 0
sumcols [r] = r
- sumcols (r1:r2:rs) = sumcols $ map (uncurry max) (zip r1 r2) : rs
+ sumcols (r1:r2:rs) = sumcols $ zipWith max r1 r2 : rs