@@ -16,7 +16,6 @@ along with this program; if not, write to the Free Software
16Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
16Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
18import Text.Pandoc
18import Text.Pandoc
19−import Text.Pandoc.Class hiding (getCurrentTime, trace)
20import qualified Text.Pandoc.UTF8 as UTF8
19import qualified Text.Pandoc.UTF8 as UTF8
21import Data.Text (Text)
20import Data.Text (Text)
22import Data.Time (getCurrentTime)
21import Data.Time (getCurrentTime)
@@ -38,7 +37,8 @@ readerBench doc (name, reader) =
38 $ writer def{ writerWrapText = WrapAuto} doc
37 $ writer def{ writerWrapText = WrapAuto} doc
39 in return $ bench (name ++ " reader") $ nf
38 in return $ bench (name ++ " reader") $ nf
40 (reader def) inp
39 (reader def) inp
40+ _ -> Debug.Trace.trace
41− _ -> trace ("\nCould not find writer for " ++ name ++ "\n") Nothing
41+ ("\nCould not find writer for " ++ name ++ "\n") Nothing
43writerBench :: Pandoc
43writerBench :: Pandoc
44 -> (String, WriterOptions -> Pandoc -> Text)
44 -> (String, WriterOptions -> Pandoc -> Text)
@@ -66,7 +66,7 @@ main = do
66 inp <- UTF8.toText <$> B.readFile "test/testsuite.txt"
66 inp <- UTF8.toText <$> B.readFile "test/testsuite.txt"
67 lalune <- B.readFile "test/lalune.jpg"
67 lalune <- B.readFile "test/lalune.jpg"
68 movie <- B.readFile "test/movie.jpg"
68 movie <- B.readFile "test/movie.jpg"
69− time <- getCurrentTime
69+ time <- Data.Time.getCurrentTime
70 let setupFakeFiles = modifyPureState $ \st -> st{ stFiles =
70 let setupFakeFiles = modifyPureState $ \st -> st{ stFiles =
71 FileTree $ Map.fromList [
71 FileTree $ Map.fromList [
72 ("lalune.jpg", FileInfo time lalune),
72 ("lalune.jpg", FileInfo time lalune),