on master help sign in
Merge pull request #2431 from melted/rm_zlib

Remove zombie dependency to zlib

commit3d222a19b0c094f6d43848b71861ccf03009c53b authorNiklas Larsson <metaniklas@gmail.com> dateSun 12 Jul 2015, 19:29 (11 years ago) parent7831e109a3735d
3 files changed−18
idris.cabal−1 src/Idris/IBC.hs−2 src/Util/Zlib.hs−15
idris.cabal−1
@@ -868,7 +868,6 @@ Library
868868 Other-modules:
869869 Util.Pretty
870870 , Util.Net
871− , Util.Zlib
872871
873872 , Pkg.PParser
874873
src/Idris/IBC.hs−2
@@ -36,9 +36,7 @@ import Control.Monad.State.Strict hiding (get, put)
3636import qualified Control.Monad.State.Strict as ST
3737import System.FilePath
3838import System.Directory
39−import Codec.Compression.Zlib (compress)
4039import Codec.Archive.Zip
41−import Util.Zlib (decompressEither)
4240
4341ibcVersion :: Word16
4442ibcVersion = 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