MissingH 1.2.0.2 → 1.2.1.0

raw patch · 5 files changed

+23/−7 lines, 5 filesdep +errorcall-eq-instancedep ~arraydep ~basedep ~containers

Dependencies added: errorcall-eq-instance

Dependency ranges changed: array, base, containers, filepath, network, process, time, unix

Files

MissingH.cabal +3/−2
src/Data/Compression/Inflate.hs +9/−0
src/System/Cmd/Utils.hs +9/−1
src/System/Debian.hs +1/−1
testsrc/Eithertest.hs +1/−3

MissingH.cabal view

@@ -1,9 +1,9 @@ Name: MissingH-Version: 1.2.0.2+Version: 1.2.1.0 License: BSD3 Maintainer: John Goerzen <jgoerzen@complete.org> Author: John Goerzen-Copyright: Copyright (c) 2004-2011 John Goerzen+Copyright: Copyright (c) 2004-2014 John Goerzen license-file: LICENSE extra-source-files: LICENSE,                     announcements/0.10.0.txt,@@ -102,6 +102,7 @@    Build-Depends: network, parsec, base,                mtl, HUnit, regex-compat,+               errorcall-eq-instance,                filepath,                hslogger   If flag(splitBase)

src/Data/Compression/Inflate.hs view

@@ -37,6 +37,7 @@ import Data.List import Data.Maybe import qualified Data.Char+import Control.Applicative import Control.Monad  import Data.Bits@@ -123,6 +124,14 @@                                 in y s'  -- return :: a -> InfM a     return x = InfM $ \s -> (x, s)++instance Applicative InfM where+    pure = return+    (<*>) = ap++instance Functor InfM where+    fmap f (InfM g) = InfM $ \s ->+        case g s of ~(a, s') -> (f a, s')  set_bits :: [Bit] -> InfM () set_bits bs = InfM $ const ((), State bs 0 (array (0, 32767) []) 0)

src/System/Cmd/Utils.hs view

@@ -95,7 +95,7 @@ -- FIXME - largely obsoleted by 6.4 - convert to wrappers.  import System.Exit-import System.Cmd+import System.Process (rawSystem) import System.Log.Logger #if !(defined(mingw32_HOST_OS) || defined(mingw32_TARGET_OS) || defined(__MINGW32__)) import System.Posix.IO@@ -325,7 +325,11 @@                 Just (Exited (ExitSuccess)) -> return ()                 Just (Exited (ExitFailure fc)) ->                     cmdfailed funcname fp args fc+#if MIN_VERSION_unix(2,7,0)+                Just (Terminated sig _) ->+#else                 Just (Terminated sig) ->+#endif                     warnfail fp args $ "Terminated by signal " ++ show sig                 Just (Stopped sig) ->                     warnfail fp args $ "Stopped by signal " ++ show sig@@ -351,7 +355,11 @@        case ec of             Exited ExitSuccess -> return ()             Exited (ExitFailure fc) -> cmdfailed "safeSystem" command args fc+#if MIN_VERSION_unix(2,7,0)+            Terminated s _ -> cmdsignalled "safeSystem" command args s+#else             Terminated s -> cmdsignalled "safeSystem" command args s+#endif             Stopped s -> cmdsignalled "safeSystem" command args s #endif

src/System/Debian.hs view

@@ -28,7 +28,7 @@                        )     where -import System.Cmd+import System.Process import System.IO.Unsafe import System.Exit

testsrc/Eithertest.hs view

@@ -12,9 +12,7 @@ import Data.Either.Utils import Test.HUnit.Tools import Control.Exception--instance Eq ErrorCall where-    (ErrorCall x) == (ErrorCall y) = x == y+import Control.Exception.ErrorCall.EqInstance  test_maybeToEither =     let f msg inp exp = TestLabel msg $ TestCase $ assertEqual "" exp inp in