From 1b4d2a04e707991bd883fd14c2c0e51be7334c7c Mon Sep 17 00:00:00 2001
From: 1computer1 <onecomputer00@gmail.com>
Date: Tue, 16 Jun 2020 22:43:21 -0400
Subject: [PATCH] remove when_/unless_

---
 src/Myriad/Docker.hs | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/src/Myriad/Docker.hs b/src/Myriad/Docker.hs
index f93802b..02795c2 100644
--- a/src/Myriad/Docker.hs
+++ b/src/Myriad/Docker.hs
@@ -42,7 +42,7 @@ buildImage lang@Language { name, concurrent } = do
     exec_ ["docker build -t ", imageName lang, " ", cs languagesDir </> cs name]
     setupQSems
     logInfo ["Built image ", cs $ imageName lang]
-    when_ prepareContainers $ setupContainer lang
+    when prepareContainers . void $ setupContainer lang
     where
         setupQSems ::  Myriad ()
         setupQSems = do
@@ -62,7 +62,7 @@ buildAllImages = do
 startCleanup :: Myriad ()
 startCleanup = do
     Config { cleanupInterval } <- asks config
-    when_ (cleanupInterval > 0) $ do
+    when (cleanupInterval > 0) . void $ do
         let t = fromIntegral cleanupInterval * 60000000
         fork $ timer t
     where
@@ -179,7 +179,7 @@ evalCode lang@Language { name, timeout, retries } numRetries code = withContaine
         timer doneRef = do
             threadDelay $ fromIntegral timeout * 1000000
             done <- readMVar doneRef
-            unless_ done $ do
+            unless done . void $ do
                 writeMVar doneRef True
                 killContainer name
 
@@ -204,9 +204,3 @@ newContainerName Language { name } = do
 
 imageName :: Language -> ImageName
 imageName Language { name } = "1computer1/comp_iler:" <> cs name
-
-when_ :: Applicative f => Bool -> f a -> f ()
-when_ p = when p . void 
-
-unless_ :: Applicative f => Bool -> f a -> f ()
-unless_ p = unless p . void