doctest 0.8.0 → 0.8.0.1

raw patch · 3 files changed

+11/−12 lines, 3 filesdep ~QuickCheckdep ~basedep ~ghcPVP ok

version bump matches the API change (PVP)

Dependency ranges changed: QuickCheck, base, ghc

API changes (from Hackage documentation)

Files

• doctest.cabal +7/−7
• src/Extract.hs +1/−1
• src/Run.hs +3/−4

@@ -1,5 +1,5 @@ name:             doctest-version:          0.8.0+version:          0.8.0.1 synopsis:         Test interactive Haskell examples description:      The doctest program checks examples in source code comments.                   It is modeled after doctest for Python@@ -43,8 +43,8 @@     , Type     , Util   build-depends:-      base        >= 4.0  && < 4.6-    , ghc         >= 6.12 && < 7.6+      base        >= 4.0  && < 4.7+    , ghc         >= 6.12 && < 7.8     , syb     , deepseq     , directory@@ -61,7 +61,7 @@   hs-source-dirs:       driver   build-depends:-      base        >= 4.0  && < 4.6+      base        >= 4.0  && < 4.7     , doctest  test-suite spec@@ -76,8 +76,8 @@   hs-source-dirs:       src, test   build-depends:-      base        >= 4.0  && < 4.6-    , ghc         >= 6.12 && < 7.6+      base        >= 4.0  && < 4.7+    , ghc         >= 6.12 && < 7.8     , syb     , deepseq     , directory@@ -86,7 +86,7 @@     , transformers     , HUnit       == 1.2.*     , hspec       >= 1.3-    , QuickCheck+    , QuickCheck  >= 2.5     , stringbuilder     , silently     , filepath

@@ -1,7 +1,7 @@ {-# LANGUAGE DeriveDataTypeable, StandaloneDeriving, DeriveFunctor #-} module Extract (Module(..), extract) where -import           Prelude hiding (mod, catch)+import           Prelude hiding (mod) import           Control.Monad import           Control.Applicative import           Control.Exception

@@ -8,14 +8,13 @@ #endif ) where -import           Prelude hiding (catch) import           Data.Monoid import           Data.List import           Control.Monad (when) import           System.Exit (exitFailure) import           System.IO -import           Control.Exception+import qualified Control.Exception as E import           Panic  import           Parse@@ -45,13 +44,13 @@       when f $ do         hPutStrLn stderr "WARNING: --optghc is deprecated, doctest now accepts arbitrary GHC options\ndirectly."         hFlush stderr-      r <- doctest_ args_ `catch` \e -> do+      r <- doctest_ args_ `E.catch` \e -> do         case fromException e of           Just (UsageError err) -> do             hPutStrLn stderr ("doctest: " ++ err)             hPutStrLn stderr "Try `doctest --help' for more information."             exitFailure-          _ -> throw e+          _ -> E.throw e       when (not $ isSuccess r) exitFailure  -- |