aboutsummaryrefslogtreecommitdiff
path: root/src/Text/Pandoc/Readers/Odt/Generic
diff options
context:
space:
mode:
authorJohn MacFarlane <jgm@berkeley.edu>2015-10-14 09:09:10 -0700
committerJohn MacFarlane <jgm@berkeley.edu>2015-10-14 09:09:10 -0700
commit82b3e0ab97a67188f0886dd6b758aa8d0ccd1064 (patch)
tree97ba94d90547b6e143031f35ae4c2bba294fe214 /src/Text/Pandoc/Readers/Odt/Generic
parent198862ee40702c8844e4d0503329b69a3062c49b (diff)
downloadpandoc-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/Generic')
-rw-r--r--src/Text/Pandoc/Readers/Odt/Generic/Fallible.hs1
-rw-r--r--src/Text/Pandoc/Readers/Odt/Generic/XMLConverter.hs1
2 files changed, 0 insertions, 2 deletions
diff --git a/src/Text/Pandoc/Readers/Odt/Generic/Fallible.hs b/src/Text/Pandoc/Readers/Odt/Generic/Fallible.hs
index 5922164c9..343ec14ee 100644
--- a/src/Text/Pandoc/Readers/Odt/Generic/Fallible.hs
+++ b/src/Text/Pandoc/Readers/Odt/Generic/Fallible.hs
@@ -43,7 +43,6 @@ import Control.Applicative
import Control.Monad
import qualified Data.Foldable as F
-import Data.Monoid
-- | Default for now. Will probably become a class at some point.
type Failure = ()
diff --git a/src/Text/Pandoc/Readers/Odt/Generic/XMLConverter.hs b/src/Text/Pandoc/Readers/Odt/Generic/XMLConverter.hs
index ec7e0ea5e..7c1764889 100644
--- a/src/Text/Pandoc/Readers/Odt/Generic/XMLConverter.hs
+++ b/src/Text/Pandoc/Readers/Odt/Generic/XMLConverter.hs
@@ -123,7 +123,6 @@ import Control.Arrow
import qualified Data.Map as M
import qualified Data.Foldable as F
import Data.Default
-import Data.Monoid ( Monoid )
import Data.Maybe
import qualified Text.XML.Light as XML