diff options
author | John MacFarlane <jgm@berkeley.edu> | 2015-10-14 09:09:10 -0700 |
---|---|---|
committer | John MacFarlane <jgm@berkeley.edu> | 2015-10-14 09:09:10 -0700 |
commit | 82b3e0ab97a67188f0886dd6b758aa8d0ccd1064 (patch) | |
tree | 97ba94d90547b6e143031f35ae4c2bba294fe214 /src/Text/Pandoc/Readers/Odt/Arrows | |
parent | 198862ee40702c8844e4d0503329b69a3062c49b (diff) | |
download | pandoc-82b3e0ab97a67188f0886dd6b758aa8d0ccd1064.tar.gz |
Use custom Prelude to avoid compiler warnings.
- The (non-exported) prelude is in prelude/Prelude.hs.
- It exports Monoid and Applicative, like base 4.8 prelude,
but works with older base versions.
- It exports (<>) for mappend.
- It hides 'catch' on older base versions.
This allows us to remove many imports of Data.Monoid
and Control.Applicative, and remove Text.Pandoc.Compat.Monoid.
It should allow us to use -Wall again for ghc 7.10.
Diffstat (limited to 'src/Text/Pandoc/Readers/Odt/Arrows')
-rw-r--r-- | src/Text/Pandoc/Readers/Odt/Arrows/State.hs | 1 | ||||
-rw-r--r-- | src/Text/Pandoc/Readers/Odt/Arrows/Utils.hs | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/src/Text/Pandoc/Readers/Odt/Arrows/State.hs b/src/Text/Pandoc/Readers/Odt/Arrows/State.hs index 310ca028e..2cc83183f 100644 --- a/src/Text/Pandoc/Readers/Odt/Arrows/State.hs +++ b/src/Text/Pandoc/Readers/Odt/Arrows/State.hs @@ -44,7 +44,6 @@ import qualified Control.Category as Cat import Control.Arrow import Control.Monad -import Data.Monoid import Data.Foldable import Text.Pandoc.Readers.Odt.Arrows.Utils diff --git a/src/Text/Pandoc/Readers/Odt/Arrows/Utils.hs b/src/Text/Pandoc/Readers/Odt/Arrows/Utils.hs index 9710973b3..d4dcf5be2 100644 --- a/src/Text/Pandoc/Readers/Odt/Arrows/Utils.hs +++ b/src/Text/Pandoc/Readers/Odt/Arrows/Utils.hs @@ -42,7 +42,6 @@ module Text.Pandoc.Readers.Odt.Arrows.Utils where import Control.Arrow import Control.Monad ( join, MonadPlus(..) ) -import Data.Monoid import qualified Data.Foldable as F import Text.Pandoc.Readers.Odt.Generic.Fallible |