Merge remote-tracking branch 'origin/master' into ghc-head

1 files changed, 4 insertions, 2 deletions

diff --git a/hypsrc-test/Main.hs b/hypsrc-test/Main.hs
index 0490be47..d3ab79a8 100644
--- a/hypsrc-test/Main.hs
+++ b/hypsrc-test/Main.hs
@@ -3,6 +3,7 @@
 
 import Data.Char
 import Data.List
+import Data.Function (on)
 
 import System.Environment
 import System.FilePath
@@ -13,9 +14,10 @@ import Test.Haddock.Xhtml
 
 checkConfig :: CheckConfig Xml
 checkConfig = CheckConfig
-    { ccfgRead = \_ input -> strip <$> parseXml input
+    { ccfgRead = parseXml
+    , ccfgClean = \_ -> strip
     , ccfgDump = dumpXml
-    , ccfgEqual = (==)
+    , ccfgEqual = (==) `on` dumpXml
     }
   where
     strip = stripAnchors' . stripLinks' . stripFooter