7f676b5 · typeable/pandoc

git.iko.soy/typeable/pandoc

Remove Text.Pandoc.Compat.Except

commit7f676b534aa82ae44c62d854c5d29d46c3d2c30a authorJesse Rosenthal <jrosenthal@jhu.edu> dateWed 31 Aug 2016, 17:44 (10 years ago) parent26c3705

8 files changed+6−16

compare with master

unifiedsplit

pandoc.cabal−1 src/Text/Pandoc/Error.hs−5 src/Text/Pandoc/ImageSize.hs+1−2 src/Text/Pandoc/Readers/DocBook.hs+1−1 src/Text/Pandoc/Readers/Docx.hs+1−1 src/Text/Pandoc/Readers/Docx/Parse.hs+1−4 src/Text/Pandoc/Readers/EPUB.hs+1−1 src/Text/Pandoc/Readers/OPML.hs+1−1

pandoc.cabal−1

@@ -415,7 +415,6 @@ Library

415415 Text.Pandoc.Slides,

416416 Text.Pandoc.Highlighting,

417417 Text.Pandoc.Compat.Time,

418− Text.Pandoc.Compat.Except,

419418 Text.Pandoc.Compat.TagSoupEntity,

420419 Text.Pandoc.Compat.Directory,

421420 Paths_pandoc

src/Text/Pandoc/Error.hs−5

@@ -33,7 +33,6 @@ module Text.Pandoc.Error (PandocError(..), handleError) where

3333

3434import Text.Parsec.Error

3535import Text.Parsec.Pos hiding (Line)

36−import Text.Pandoc.Compat.Except

3736import GHC.Generics (Generic)

3837import Data.Generics (Typeable)

3938import Control.Exception (Exception)

@@ -48,10 +47,6 @@ data PandocError = -- | Generic parse failure

4847

4948instance Exception PandocError

5049

51−instance Error PandocError where

52− strMsg = ParseFailure

53−

54−

5550-- | An unsafe method to handle `PandocError`s.

5651handleError :: Either PandocError a -> a

5752handleError (Right r) = r

src/Text/Pandoc/ImageSize.hs+1−2

@@ -59,8 +59,7 @@ import Numeric (showFFloat)

5959import Text.Pandoc.Definition

6060import Text.Pandoc.Options

6161import qualified Data.Map as M

62−import Text.Pandoc.Compat.Except

63−import Control.Monad.Trans

62+import Control.Monad.Except

6463import Data.Maybe (fromMaybe)

6564

6665-- quick and dirty functions to get image sizes

src/Text/Pandoc/Readers/DocBook.hs+1−1

@@ -14,7 +14,7 @@ import Data.List (intersperse)

1414import Data.Maybe (fromMaybe)

1515import Text.TeXMath (readMathML, writeTeX)

1616import Text.Pandoc.Error (PandocError)

17−import Text.Pandoc.Compat.Except

17+import Control.Monad.Except

1818import Data.Default

1919import Data.Foldable (asum)

2020

src/Text/Pandoc/Readers/Docx.hs+1−1

@@ -98,7 +98,7 @@ import Data.Traversable (traverse)

9898#endif

9999

100100import Text.Pandoc.Error

101−import Text.Pandoc.Compat.Except

101+import Control.Monad.Except

102102

103103readDocxWithWarnings :: ReaderOptions

104104 -> B.ByteString

src/Text/Pandoc/Readers/Docx/Parse.hs+1−4

@@ -64,7 +64,7 @@ import Control.Monad.Reader

6464import Control.Monad.State

6565import Control.Applicative ((<|>))

6666import qualified Data.Map as M

67−import Text.Pandoc.Compat.Except

67+import Control.Monad.Except

6868import Text.Pandoc.Shared (safeRead)

6969import Text.TeXMath.Readers.OMML (readOMML)

7070import Text.Pandoc.Readers.Docx.Fonts (getUnicode, Font(..))

@@ -91,9 +91,6 @@ data ReaderState = ReaderState { stateWarnings :: [String] }

9191data DocxError = DocxError | WrongElem

9292 deriving Show

9393

94−instance Error DocxError where

95− noMsg = WrongElem

96−

9794type D = ExceptT DocxError (ReaderT ReaderEnv (State ReaderState))

9895

9996runD :: D a -> ReaderEnv -> ReaderState -> (Either DocxError a, ReaderState)

src/Text/Pandoc/Readers/EPUB.hs+1−1

@@ -16,7 +16,7 @@ import Text.Pandoc.Options ( ReaderOptions(..), readerTrace)

1616import Text.Pandoc.Shared (escapeURI, collapseFilePath, addMetaField)

1717import Network.URI (unEscapeString)

1818import Text.Pandoc.MediaBag (MediaBag, insertMedia)

19−import Text.Pandoc.Compat.Except (MonadError, throwError, runExcept, Except)

19+import Control.Monad.Except (MonadError, throwError, runExcept, Except)

2020import Text.Pandoc.MIME (MimeType)

2121import qualified Text.Pandoc.Builder as B

2222import Codec.Archive.Zip ( Archive (..), toArchiveOrFail, fromEntry

src/Text/Pandoc/Readers/OPML.hs+1−1

@@ -11,7 +11,7 @@ import Text.Pandoc.Compat.TagSoupEntity (lookupEntity)

1111import Data.Generics

1212import Control.Monad.State

1313import Data.Default

14−import Text.Pandoc.Compat.Except

14+import Control.Monad.Except

1515import Text.Pandoc.Error

1616

1717type OPML = ExceptT PandocError (State OPMLState)