From 24d095cad7969a7bdadd1fa05c4742f4d66033e6 Mon Sep 17 00:00:00 2001 From: tv Date: Sun, 27 Jan 2019 19:59:11 +0100 Subject: Reaktor.Plugins.System.hWithLines: use untilM_ --- src/Reaktor/Plugins/System.hs | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'src/Reaktor/Plugins/System.hs') diff --git a/src/Reaktor/Plugins/System.hs b/src/Reaktor/Plugins/System.hs index 8ca468c..de96a61 100644 --- a/src/Reaktor/Plugins/System.hs +++ b/src/Reaktor/Plugins/System.hs @@ -10,7 +10,7 @@ import Control.Applicative import Control.Concurrent (forkIO,threadDelay) import Control.Concurrent.Async (race) import Control.Exception -import Control.Monad (forM_) +import Control.Monad.Extended (forM_,untilM_) import qualified Data.HashMap.Lazy as M import qualified Data.List as L import qualified Data.Text.Extended as T @@ -217,9 +217,4 @@ signalProcessGroup' sig pgid = hWithLines :: Handle -> (Text -> IO ()) -> IO () hWithLines h f = do hSetBuffering h LineBuffering - go `finally` hClose h - where - go = - hIsEOF h >>= \case - True -> return () - False -> T.hGetLine h >>= f >> go + untilM_ (hIsEOF h) (T.hGetLine h >>= f) `finally` hClose h -- cgit v1.2.3