From e5583aa23ddee103eda81a9c976e35433c5a8e82 Mon Sep 17 00:00:00 2001 From: Oleg Grenrus Date: Tue, 9 Feb 2016 19:52:25 +0200 Subject: [PATCH] Try to compile with GHC 8.0.1 --- .travis.yml | 2 -- Haxl/Core/Monad.hs | 1 + 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index b47d8d8..501b4fc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,8 +22,6 @@ matrix: - env: CABALVER=1.24 GHCVER=8.0.1 compiler: ": #GHC 8.0.1" addons: {apt: {packages: [cabal-install-1.24,ghc-8.0.1], sources: [hvr-ghc]}} - allow_failures: - - env: CABALVER=1.24 GHCVER=8.0.1 before_install: - unset CC diff --git a/Haxl/Core/Monad.hs b/Haxl/Core/Monad.hs index 081c9fd..30a5519 100644 --- a/Haxl/Core/Monad.hs +++ b/Haxl/Core/Monad.hs @@ -740,6 +740,7 @@ cachedComputation req haxl = GenHaxl $ \env ref -> do -- continuation: just try to evaluate the memo again. We know it is -- already in the cache (because we just checked), so the computation -- will never be used. + retryMemo :: (Typeable (req a)) => req a -> GenHaxl u a retryMemo req = cachedComputation req (throw (CriticalError "retryMemo"))