From ebea74dc35ec39c9fdbba8b100edd7b25a0f1ddc Mon Sep 17 00:00:00 2001
From: John MacFarlane <jgm@berkeley.edu>
Date: Sun, 29 Sep 2019 18:29:49 -0700
Subject: Fix benchmarks so they compile again.

---
 benchmark/benchmark-pandoc.hs | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

(limited to 'benchmark')

diff --git a/benchmark/benchmark-pandoc.hs b/benchmark/benchmark-pandoc.hs
index 2649af8b3..8968cad3e 100644
--- a/benchmark/benchmark-pandoc.hs
+++ b/benchmark/benchmark-pandoc.hs
@@ -41,16 +41,17 @@ readerBench doc name =
                $ nf (\i -> either (error . show) id $ runPure (readerFun i))
                  inp
        Left _ -> Nothing
-  where res = runPure $
-          case (getReader name, getWriter name) of
-            (Right (TextReader r, rexts),
-             Right (TextWriter w, wexts)) -> do
-               setResourcePath ["../test"]
-               inp <- w def{ writerWrapText = WrapAuto
-                           , writerExtensions = wexts } doc
-               return $ (r def{ readerExtensions = rexts }, inp)
-            _ -> throwError $ PandocSomeError
-                 $ "could not get text reader and writer for " ++ name
+  where res = runPure $ do
+          (rdr, rexts) <- getReader name
+          (wtr, wexts) <- getWriter name
+          case (rdr, wtr) of
+            (TextReader r, TextWriter w) -> do
+                     setResourcePath ["../test"]
+                     inp <- w def{ writerWrapText = WrapAuto
+                                 , writerExtensions = wexts } doc
+                     return $ (r def{ readerExtensions = rexts }, inp)
+            _ -> throwError $ PandocSomeError $ "not a text format: "
+                                 ++ name
 
 getImages :: IO [(FilePath, MimeType, BL.ByteString)]
 getImages = do
@@ -75,11 +76,12 @@ writerBench doc name =
                                         writerFun d)) doc
        Left _ -> Nothing
   where res = runPure $ do
-          case (getWriter name) of
-            Right (TextWriter w, wexts) ->
+          (wtr, wexts) <- getWriter name
+          case wtr of
+            TextWriter w ->
               return $ w def{ writerExtensions = wexts }
             _ -> throwError $ PandocSomeError
-                 $ "could not get text reader and writer for " ++ name
+                 $ "could not get text writer for " ++ name
 
 main :: IO ()
 main = do
-- 
cgit v1.2.3