From 7f59622782b75060aa55a2d346d6910b1416adca Mon Sep 17 00:00:00 2001 From: Neil Mitchell Date: Sat, 13 Feb 2016 09:08:45 +0000 Subject: [PATCH] #415, switch back to join/evaluate, since lazy doesn't work (uhoh!) --- src/Development/Shake/Monad.hs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/Development/Shake/Monad.hs b/src/Development/Shake/Monad.hs index de871ad6e..696272fac 100644 --- a/src/Development/Shake/Monad.hs +++ b/src/Development/Shake/Monad.hs @@ -15,7 +15,6 @@ import Control.Monad.Trans.Reader import Data.IORef import Control.Applicative import Control.Monad -import GHC.Exts(lazy) import Prelude @@ -33,7 +32,7 @@ type Capture a = (a -> IO ()) -> IO () -- See https://ghc.haskell.org/trac/ghc/ticket/11555 catchSafe :: IO a -> (SomeException -> IO a) -> IO a -catchSafe a b = lazy a `catch_` b +catchSafe a b = join (evaluate a) `catch_` b -- | Run and then call a continuation. runRAW :: ro -> rw -> RAW ro rw a -> Capture (Either SomeException a)