slowly adding mtl stuff.

src/Argo/Stack.hs

@@ -47,7 +47,6 @@ import           System.Process.Typed           ( readProcessStdout_
                                                 , proc
                                                 , shell
                                                 , setEnv
-                                                , setEnvInherit
                                                 )
 import           Text.Show.Pretty
 

src/Argo/Utils.hs

@@ -92,7 +92,7 @@ myWhich str =
     "" -> die $ "Argo `" <> str <> "` not in $PATH."
     p  -> printInfo ("Found " <> str <> " at " <> p) $> p
 
-sudoRemoveFile ::(Text -> IO ()) -> Text -> Text -> IO ()
+sudoRemoveFile :: (Text -> IO ()) -> Text -> Text -> IO ()
 sudoRemoveFile printer desc filePath = do
   foundSocket <- doesFileExist $ toS filePath
   when foundSocket $ go False
@@ -149,27 +149,35 @@ withAsyncs :: IO a -> IO a1 -> (Async a -> Async a1 -> IO b) -> IO b
 withAsyncs io1 io2 f = withAsync io1 $ \a1 -> withAsync io2 $ \a2 -> f a1 a2
 
 doFilter
-  :: Maybe TextBehavior
-  -> ConduitT () ByteString IO ()
-  -> ConduitT ByteString Void IO ()
-  -> IO TracebackScan
+  :: (MonadIO m)
+  => Maybe TextBehavior
+  -> ConduitT () ByteString m ()
+  -> ConduitT ByteString Void m ()
+  -> m TracebackScan
 doFilter behavior source sink =
   runConduit $ source .| CB.lines .| makeBehavior behavior `fuseUpstream` sink
 
 makeBehavior
-  :: Maybe TextBehavior -> ConduitT ByteString ByteString IO TracebackScan
+  :: (MonadIO m)
+  => Maybe TextBehavior
+  -> ConduitT ByteString ByteString m TracebackScan
 makeBehavior = \case
   Just ExpectClean       -> warnOnTraceback False
   Just (WaitFor message) -> untilMatch message False
   Nothing                -> awaitForever yield $> Clean
 
-warnOnTraceback :: Bool -> ConduitT ByteString ByteString IO TracebackScan
+warnOnTraceback
+  :: (MonadIO m) => Bool -> ConduitT ByteString ByteString m TracebackScan
 warnOnTraceback sawTraceback = await >>= \case
   Just b | B.isInfixOf "Traceback" b -> yield b >> warnOnTraceback True
          | otherwise                 -> yield b >> warnOnTraceback sawTraceback
   Nothing -> if sawTraceback then return WarningTraceback else return Clean
 
-untilMatch :: Text -> Bool -> ConduitT ByteString ByteString IO TracebackScan
+untilMatch
+  :: (MonadIO m)
+  => Text
+  -> Bool
+  -> ConduitT ByteString ByteString m TracebackScan
 untilMatch msg sawTraceback = await >>= \case
   Just b
     | B.isInfixOf "Traceback" b