Fix some dejafu-tests warnings

dejafu-tests/lib/Common.hs

@@ -126,7 +126,7 @@ prop_dep_fun conc = H.property $ do
       let tids2 = toTIdTrace trc2
       pure (efa1, map fst tids1, efa2, map fst tids2)
 
-    play memtype conc s g = runConcurrent s memtype g conc
+    play memtype c s g = runConcurrent s memtype g c
 
 -------------------------------------------------------------------------------
 -- Exceptions

dejafu-tests/lib/Integration/MultiThreaded.hs

@@ -306,11 +306,11 @@ hacksTests = toTestList
         takeMVar out
 
     , djfuT "Thread IDs are consistent between the inner action and the outside" (sometimesFailsWith isUncaughtException) $ do
-        (tid, trigger) <- dontCheck Nothing $ do
+        trigger <- dontCheck Nothing $ do
           me <- myThreadId
           v <- newEmptyMVar
-          t <- fork $ takeMVar v >> killThread me
+          _ <- fork $ takeMVar v >> killThread me
-          pure (t, v)
+          pure v
         putMVar trigger ()
 
     , djfuT "Inner action is run under sequential consistency" (gives' [1]) $ do

dejafu-tests/lib/Integration/SCT.hs

@@ -31,7 +31,7 @@ discardTests = toTestList
         const (Just DiscardResultAndTrace)
     , check "Results failing the test are not present" [1, 2] $
         \x -> if x == Right 3 then Just DiscardResultAndTrace else Nothing
-    , testCase "No traces kept when they get discared" $ testDiscardTrace discarder testAction
+    , testCase "No traces kept when they get discared" $ testDiscardTrace testAction
     ]
   where
     check name xs f = testDejafuWithSettings (set ldiscard (Just f) defaultSettings) name (gives' xs) testAction
@@ -41,11 +41,12 @@ discardTests = toTestList
       _ <- fork $ putMVar mvar 2
       _ <- fork $ putMVar mvar 3
       readMVar mvar
+
     discarder (Right 2) = Just DiscardTrace
     discarder (Right 3) = Just DiscardResultAndTrace
     discarder  _ = Nothing
 
-    testDiscardTrace discarder action = do
+    testDiscardTrace action = do
       results <- runSCTWithSettings (set ldiscard (Just discarder) defaultSettings) action
       for_ results $ \(efa, trace) -> case discarder efa of
         Just DiscardResultAndTrace -> assertFailure "expected result to be discarded"

dejafu-tests/lib/Integration/SingleThreaded.hs

@@ -288,7 +288,7 @@ hacksTests = toTestList
 
       , snapshotTest "Lifted IO is re-run (1)" (gives' [2..151]) $ do
           r <- dontCheck Nothing $ do
-            r <- liftIO (IORef.newIORef 0)
+            r <- liftIO (IORef.newIORef (0::Int))
             liftIO (IORef.modifyIORef r (+1))
             pure r
           liftIO (IORef.readIORef r)
@@ -296,14 +296,14 @@ hacksTests = toTestList
       , snapshotTest "Lifted IO is re-run (2)" (gives' [1]) $ do
           r <- dontCheck Nothing $ do
             let modify r f = liftIO (IORef.readIORef r) >>= liftIO . IORef.writeIORef r . f
-            r <- liftIO (IORef.newIORef 0)
+            r <- liftIO (IORef.newIORef (0::Int))
             modify r (+1)
             pure r
           liftIO (IORef.readIORef r)
 
       , snapshotTest "Lifted IO is re-run (3)" (gives' [1]) $ do
           r <- dontCheck Nothing $ do
-            r <- liftIO (IORef.newIORef 0)
+            r <- liftIO (IORef.newIORef (0::Int))
             liftIO (IORef.writeIORef r 0)
             liftIO (IORef.modifyIORef r (+1))
             pure r

dejafu-tests/lib/Unit/Properties.hs

@@ -5,7 +5,6 @@ import qualified Control.Exception                as E
 import           Control.Monad                    (zipWithM)
 import qualified Control.Monad.Conc.Class         as C
 import           Control.Monad.IO.Class           (liftIO)
-import qualified Control.Monad.ST                 as ST
 import qualified Data.Foldable                    as F
 import qualified Data.Map                         as M
 import qualified Data.Sequence                    as S