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

1 files changed, 4 insertions, 2 deletions

diff --git a/html-test/Main.hs b/html-test/Main.hs
index 3880fc3c..67dbeec6 100755
--- a/html-test/Main.hs
+++ b/html-test/Main.hs
@@ -2,6 +2,7 @@
 
 
 import Data.Char
+import Data.Function (on)
 
 import System.Environment
 import System.FilePath
@@ -12,9 +13,10 @@ import Test.Haddock.Xhtml
 
 checkConfig :: CheckConfig Xml
 checkConfig = CheckConfig
-    { ccfgRead = \mdl input -> stripIfRequired mdl <$> parseXml input
+    { ccfgRead = parseXml
+    , ccfgClean = stripIfRequired
     , ccfgDump = dumpXml
-    , ccfgEqual = (==)
+    , ccfgEqual = (==) `on` dumpXml
     }