aboutsummaryrefslogtreecommitdiff
path: root/src/Text
diff options
context:
space:
mode:
authorJoseph C. Sible <josephcsible@users.noreply.github.com>2020-02-05 01:38:49 -0500
committerGitHub <noreply@github.com>2020-02-04 22:38:49 -0800
commitb018028ee9f733d5c6907e4ef362794e75b8c38c (patch)
tree10caa2c2317b5993736bf19bd44c8abbffff9e68 /src/Text
parentfd9c03febe92411bfdfc63e8f19a037cf04f3a0e (diff)
downloadpandoc-b018028ee9f733d5c6907e4ef362794e75b8c38c.tar.gz
Remove our bool function (#6116)
Data.Bool already provides a bool function identical to this one.
Diffstat (limited to 'src/Text')
-rw-r--r--src/Text/Pandoc/Readers/Odt/Generic/Utils.hs9
-rw-r--r--src/Text/Pandoc/Readers/Odt/Generic/XMLConverter.hs1
2 files changed, 1 insertions, 9 deletions
diff --git a/src/Text/Pandoc/Readers/Odt/Generic/Utils.hs b/src/Text/Pandoc/Readers/Odt/Generic/Utils.hs
index ead0d2f9e..5889f2d08 100644
--- a/src/Text/Pandoc/Readers/Odt/Generic/Utils.hs
+++ b/src/Text/Pandoc/Readers/Odt/Generic/Utils.hs
@@ -20,7 +20,6 @@ module Text.Pandoc.Readers.Odt.Generic.Utils
, uncurry6
, swap
, reverseComposition
-, bool
, tryToRead
, Lookupable(..)
, readLookupables
@@ -59,14 +58,6 @@ composition = F.foldr (<<<) Cat.id
reverseComposition :: (Category cat, F.Foldable f) => f (cat a a) -> cat a a
reverseComposition = F.foldr (>>>) Cat.id
--- | 'Either' has 'either', 'Maybe' has 'maybe'. 'Bool' should have 'bool'.
--- Note that the first value is selected if the boolean value is 'False'.
--- That makes 'bool' consistent with the other two. Also, 'bool' now takes its
--- arguments in the exact opposite order compared to the normal if construct.
-bool :: a -> a -> Bool -> a
-bool x _ False = x
-bool _ x True = x
-
-- | This function often makes it possible to switch values with the functions
-- that are applied to them.
--
diff --git a/src/Text/Pandoc/Readers/Odt/Generic/XMLConverter.hs b/src/Text/Pandoc/Readers/Odt/Generic/XMLConverter.hs
index 59d1b8abd..796026843 100644
--- a/src/Text/Pandoc/Readers/Odt/Generic/XMLConverter.hs
+++ b/src/Text/Pandoc/Readers/Odt/Generic/XMLConverter.hs
@@ -60,6 +60,7 @@ import Control.Applicative hiding ( liftA, liftA2 )
import Control.Monad ( MonadPlus )
import Control.Arrow
+import Data.Bool ( bool )
import Data.Either ( rights )
import qualified Data.Map as M
import qualified Data.Text as T