cleanup: code review

Author: ulidtko

tests/integration/lib/StackTest/Repl.hs

@@ -6,14 +6,15 @@ module StackTest.Repl
     , ReplConnection (..)
     , nextPrompt
     , replCommand
+    , replGetChar
     , replGetLine
     , stackRepl
     -- * Reexport
     , module StackTest
     ) where
 
 import Control.Exception (SomeException, catch, displayException, finally)
-import Control.Monad (unless, when)
+import Control.Monad ((>=>), unless, when)
 import Control.Monad.IO.Class (liftIO)
 import Control.Monad.Trans (lift)
 import Control.Monad.Trans.Reader
@@ -53,6 +54,9 @@ replCommand cmd = do
   liftIO . putStrLn $ "____> " <> cmd
   liftIO $ hPutStrLn replStdinHandle cmd
 
+replGetChar :: Repl Char
+replGetChar = asks replStdout >>= liftIO . hGetChar
+
 replGetLine :: Repl String
 replGetLine = ask >>= liftIO . hGetLine . replStdout
 
@@ -100,7 +104,7 @@ runRepl cmd args actions = do
       putStrLn "EXCEPTION in test: "
       putStrLn . quote $ displayException e
       putStrLn "------[ stderr of repl ]------"
-      withFile stderrBufPath ReadMode $ \h -> hGetContents' h >>= putStr . quote
+      withFile stderrBufPath ReadMode $ hGetContents' >=> putStr . quote
       putStrLn "=============================="
     `finally` do
       hClose stderrBufHandle

tests/integration/tests/3926-ghci-with-sublibraries/Main.hs

@@ -11,9 +11,7 @@ main = do
   copy "src-internal/Internal.v1" "src-internal/Internal.hs"
   stack ["build"] -- need a build before ghci at the moment, see #4148
   stackRepl [] $ do
-    liftIO $ putStrLn "Awaiting prompt..."
     nextPrompt
-    liftIO $ putStrLn "Initial prompt received"
     replCommand ":main"
     line <- replGetLine
     let expected = "hello world"