git.iko.soy/Idris-dev
on master help sign in
Merge pull request #2431 from melted/rm_zlib
3d222a1Niklas Larsson
idris.cabal−1
compare with master
unifiedsplit
@@ -868,7 +868,6 @@ Library
868 Other-modules:
868 Other-modules:
869 Util.Pretty
869 Util.Pretty
870 , Util.Net
870 , Util.Net
871− , Util.Zlib
872
871
873 , Pkg.PParser
872 , Pkg.PParser
874
873
src/Idris/IBC.hs−2
@@ -36,9 +36,7 @@ import Control.Monad.State.Strict hiding (get, put)
36import qualified Control.Monad.State.Strict as ST
36import qualified Control.Monad.State.Strict as ST
37import System.FilePath
37import System.FilePath
38import System.Directory
38import System.Directory
39−import Codec.Compression.Zlib (compress)
40import Codec.Archive.Zip
39import Codec.Archive.Zip
41−import Util.Zlib (decompressEither)
42
40
43ibcVersion :: Word16
41ibcVersion :: Word16
44ibcVersion = 114
42ibcVersion = 114
src/Util/Zlib.hsdeleted−15
@@ -1,15 +0,0 @@
1−module Util.Zlib (decompressEither) where
2−
3−-- From http://stackoverflow.com/questions/10043102/how-to-catch-the-decompress-ioerror/10045963#10045963
4−import Codec.Compression.Zlib.Internal
5−import Data.ByteString.Lazy (ByteString, fromChunks)
6−import Control.Arrow (right)
7−
8−decompressEither :: ByteString -> Either (DecompressError, String) ByteString
9−decompressEither = finalise
10− . foldDecompressStream cons nil err
11− . decompressWithErrors zlibFormat defaultDecompressParams
12− where err errorCode errorString = Left (errorCode, errorString)
13− nil = Right []
14− cons chunk = right (chunk :)
15− finalise = right fromChunks