Fix tests broken by GHC

Changes in 19626218566ea709b5f6f287d3c296b0c4021de2 affected some
of the hyperlinker output. Accepted the new output (hovering over a
`..` now shows you what that wildcard binds).

Also fixed some stray deprecation warnings.

3 files changed, 24 insertions, 13 deletions

diff --git a/haddock-api/src/Haddock/Convert.hs b/haddock-api/src/Haddock/Convert.hs
index 9c876b14..37bad0d8 100644
--- a/haddock-api/src/Haddock/Convert.hs
+++ b/haddock-api/src/Haddock/Convert.hs
@@ -44,7 +44,7 @@ import TysWiredIn ( eqTyConName, listTyConName, liftedTypeKindTyConName
 import PrelNames ( hasKey, eqTyConKey, ipClassKey, tYPETyConKey
                  , liftedRepDataConKey )
 import Unique ( getUnique )
-import Util ( chkAppend,dropList, filterByList, filterOut, splitAtList )
+import Util ( chkAppend,dropList, filterByList, filterOut )
 import Var
 import VarSet
 
diff --git a/haddock-api/src/Haddock/Interface/Create.hs b/haddock-api/src/Haddock/Interface/Create.hs
index 8d7b1338..a63f44ce 100644
--- a/haddock-api/src/Haddock/Interface/Create.hs
+++ b/haddock-api/src/Haddock/Interface/Create.hs
@@ -52,7 +52,7 @@ import Packages   ( lookupModuleInAllPackages, PackageName(..) )
 import Bag
 import RdrName
 import TcRnTypes
-import FastString ( unpackFS, fastStringToByteString)
+import FastString ( unpackFS, bytesFS )
 import BasicTypes ( StringLiteral(..), SourceText(..), PromotionFlag(..) )
 import qualified Outputable as O
 
@@ -296,8 +296,8 @@ moduleWarning dflags gre (WarnAll w) = Just <$> parseWarning dflags gre w
 
 parseWarning :: DynFlags -> GlobalRdrEnv -> WarningTxt -> ErrMsgM (Doc Name)
 parseWarning dflags gre w = case w of
-  DeprecatedTxt _ msg -> format "Deprecated: " (foldMap (fastStringToByteString . sl_fs . unLoc) msg)
-  WarningTxt    _ msg -> format "Warning: "    (foldMap (fastStringToByteString . sl_fs . unLoc) msg)
+  DeprecatedTxt _ msg -> format "Deprecated: " (foldMap (bytesFS . sl_fs . unLoc) msg)
+  WarningTxt    _ msg -> format "Warning: "    (foldMap (bytesFS . sl_fs . unLoc) msg)
   where
     format x bs = DocWarning . DocParagraph . DocAppend (DocString x)
                   <$> processDocString dflags gre (mkHsDocStringUtf8ByteString bs)
diff --git a/hypsrc-test/ref/src/Records.html b/hypsrc-test/ref/src/Records.html
index dc09ff82..abe06202 100644
--- a/hypsrc-test/ref/src/Records.html
+++ b/hypsrc-test/ref/src/Records.html
@@ -1284,22 +1284,33 @@ forall a. Num a =&gt; a -&gt; a -&gt; a
 	></span
       ><span
       > </span
+      ><span class="annot"
+      ><a href="Records.html#Point"
+	><span class="hs-identifier hs-type"
+	  >Point</span
+	  ></a
+	></span
+      ><span class="hs-special"
+      >{</span
       ><span id=""
       ><span id=""
 	><span class="annot"
-	  ><a href="Records.html#Point"
-	    ><span class="hs-identifier hs-type"
-	      >Point</span
+	  ><span class="annottext"
+	    >Int
+y :: Int
+x :: Int
+y :: Point -&gt; Int
+x :: Point -&gt; Int
+</span
+	    ><a href="#"
+	    ><span class="hs-glyph hs-var hs-var hs-var hs-var"
+	      >..</span
 	      ></a
 	    ></span
-	  ><span class="hs-special"
-	  >{</span
-	  ><span class="hs-glyph"
-	  >..</span
-	  ><span class="hs-special"
-	  >}</span
 	  ></span
 	></span
+      ><span class="hs-special"
+      >}</span
       ><span
       > </span
       ><span class="hs-glyph"