diff -ru orig/unit-tests/run-unit-tests.hs new/unit-tests/run-unit-tests.hs --- orig/unit-tests/run-unit-tests.hs 2014-05-11 18:47:29.102698531 +0300 +++ new/unit-tests/run-unit-tests.hs 2014-05-11 18:47:28.000000000 +0300 @@ -191,7 +191,7 @@ test_catch :: TestCase test_catch = TestCase "catch" [] $ do setImports ["Prelude"] - succeeds (action `catch` handler) @@? "catch failed" + succeeds (action `MC.catch` handler) @@? "catch failed" where handler DivideByZero = return "catched" handler e = throwM e action = do s <- eval "1 `div` 0 :: Int" @@ -203,7 +203,7 @@ liftIO $ do r <- newEmptyMVar let concurrent = runInterpreter (liftIO $ putMVar r False) - `catch` \MultipleInstancesNotAllowed -> + `MC.catch` \MultipleInstancesNotAllowed -> do liftIO $ putMVar r True return $ Right () _ <- forkIO $ concurrent >> return ()