Fix hlint warnings

IntersectMBO · Aug 11, 2020 · 4c13a71 · 4c13a71
1 parent bd0cf94
commit 4c13a71
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/cardano-node/test/Test/Common/Base.hs b/cardano-node/test/Test/Common/Base.hs
@@ -11,9 +11,8 @@ import           Control.Monad.IO.Class (liftIO)
 import           Data.Bool
 import           Data.Either (Either (..))
 import           Data.Function (($), (.))
-import           Data.Functor
 import           Data.Int
-import           Data.Maybe (Maybe (..), fromMaybe, listToMaybe)
+import           Data.Maybe (Maybe (..), listToMaybe, maybe)
 import           Data.Monoid (Monoid (..))
 import           Data.Semigroup (Semigroup (..))
 import           Data.String (String)
@@ -72,7 +71,7 @@ workspace prefixPath f = GHC.withFrozenCallStack $ do
 -- the block fails.
 moduleWorkspace :: HasCallStack => FilePath -> (FilePath -> H.PropertyT IO ()) -> H.PropertyT IO ()
 moduleWorkspace prefixPath f = GHC.withFrozenCallStack $ do
-  let srcModule = fromMaybe "UnknownModule" (fmap (GHC.srcLocModule . snd) (listToMaybe (getCallStack callStack)))
+  let srcModule = maybe "UnknownModule"  (GHC.srcLocModule . snd) (listToMaybe (getCallStack callStack))
   workspace (prefixPath <> "/" <> srcModule) f
 
 createDirectoryIfMissing :: HasCallStack => FilePath -> H.PropertyT IO ()

diff --git a/cardano-node/test/Test/Common/Process.hs b/cardano-node/test/Test/Common/Process.hs
@@ -34,7 +34,7 @@ createProcess :: HasCallStack
   -> H.PropertyT IO (Maybe Handle, Maybe Handle, Maybe Handle, ProcessHandle)
 createProcess cp = GHC.withFrozenCallStack $ do
   case IO.cmdspec cp of
-    RawCommand cmd args -> H.annotate $ "Command line: " <> cmd <> " " <> L.intercalate " " args
+    RawCommand cmd args -> H.annotate $ "Command line: " <> cmd <> " " <> L.unwords args
     ShellCommand cmd -> H.annotate $ "Command line: " <> cmd
   H.evalM . liftIO $ IO.createProcess cp