Unbreak haxl on ghc 7.10

Some ghc internal packages bumped their versions.
Thanks @FranklinChen for reporting this issue.
Closes #28
This commit is contained in:
watashi 2015-04-09 23:01:26 -07:00
parent 9f873ed35a
commit 580aadb747
2 changed files with 6 additions and 10 deletions

View File

@ -46,8 +46,7 @@ import Haxl.Core.Util
import Haxl.Core.DataCache as DataCache
import qualified Data.Text as Text
import Control.Exception (Exception(..), SomeException, SomeAsyncException(..),
AllocationLimitExceeded(..))
import Control.Exception (Exception(..), SomeException, SomeAsyncException(..))
import Control.Monad
import qualified Control.Exception as Exception
import Control.Applicative hiding (Const)
@ -420,9 +419,6 @@ cacheResult req val = GenHaxl $ \env _ref -> do
rethrowAsyncExceptions :: SomeException -> IO ()
rethrowAsyncExceptions e
| Just SomeAsyncException{} <- fromException e = Exception.throw e
| Just AllocationLimitExceeded{} <- fromException e = Exception.throw e
-- AllocationLimitExceeded is not a child of SomeAsyncException,
-- but it should be.
| otherwise = return ()
-- | Inserts a request/result pair into the cache. Throws an exception

View File

@ -27,16 +27,16 @@ library
build-depends:
HUnit == 1.2.*,
aeson >= 0.6 && <0.9,
aeson >= 0.6 && < 0.9,
base == 4.*,
bytestring >= 0.9 && <0.11,
bytestring >= 0.9 && < 0.11,
containers == 0.5.*,
directory >= 1.1 && <1.3,
filepath == 1.3.*,
directory >= 1.1 && < 1.3,
filepath >= 1.3 && < 1.5,
hashable == 1.2.*,
pretty == 1.1.*,
text >= 1.1.0.1 && < 1.3,
time == 1.4.*,
time >= 1.4 && < 1.6,
unordered-containers == 0.2.*,
vector == 0.10.*