Merge pull request #1518 from bgamari/wip/ghc-9.4-merge

Merge GHC 9.4 into `main`

6 files changed, 33 insertions, 19 deletions

diff --git a/hypsrc-test/Main.hs b/hypsrc-test/Main.hs
index f7614927..e7afb61c 100644
--- a/hypsrc-test/Main.hs
+++ b/hypsrc-test/Main.hs
@@ -2,7 +2,7 @@
 
 
 import Data.Char
-import Data.List
+import Data.List (isPrefixOf)
 import Data.Function (on)
 
 import System.Environment
diff --git a/hypsrc-test/ref/src/Classes.html b/hypsrc-test/ref/src/Classes.html
index 688b6db6..4b0343cf 100644
--- a/hypsrc-test/ref/src/Classes.html
+++ b/hypsrc-test/ref/src/Classes.html
@@ -194,7 +194,7 @@
 	><span class="annottext"
 	  >bar :: Int -&gt; Int
 </span
-	  ><a href="#"
+	  ><a href="Classes.html#bar"
 	  ><span class="hs-identifier hs-var hs-var hs-var hs-var"
 	    >bar</span
 	    ></a
@@ -226,7 +226,7 @@ forall a. a -&gt; a
 	><span class="annottext"
 	  >baz :: Int -&gt; (Int, Int)
 </span
-	  ><a href="#"
+	  ><a href="Classes.html#baz"
 	  ><span class="hs-identifier hs-var hs-var hs-var hs-var"
 	    >baz</span
 	    ></a
@@ -327,7 +327,7 @@ forall a. a -&gt; a
 	><span class="annottext"
 	  >bar :: [a] -&gt; Int
 </span
-	  ><a href="#"
+	  ><a href="Classes.html#bar"
 	  ><span class="hs-identifier hs-var hs-var hs-var hs-var"
 	    >bar</span
 	    ></a
@@ -342,6 +342,7 @@ forall a. a -&gt; a
       ><span class="annot"
       ><span class="annottext"
 	>[a] -&gt; Int
+forall a. [a] -&gt; Int
 forall (t :: * -&gt; *) a. Foldable t =&gt; t a -&gt; Int
 </span
 	><span class="hs-identifier hs-var"
@@ -359,7 +360,7 @@ forall (t :: * -&gt; *) a. Foldable t =&gt; t a -&gt; Int
 	><span class="annottext"
 	  >baz :: Int -&gt; ([a], [a])
 </span
-	  ><a href="#"
+	  ><a href="Classes.html#baz"
 	  ><span class="hs-identifier hs-var hs-var hs-var hs-var"
 	    >baz</span
 	    ></a
@@ -716,6 +717,7 @@ forall b c a. (b -&gt; c) -&gt; (a -&gt; b) -&gt; a -&gt; c
 	><span class="annot"
 	><span class="annottext"
 	  >[Int] -&gt; Int
+forall a. Num a =&gt; [a] -&gt; a
 forall (t :: * -&gt; *) a. (Foldable t, Num a) =&gt; t a -&gt; a
 </span
 	  ><span class="hs-identifier hs-var"
@@ -798,7 +800,7 @@ forall a. Foo a =&gt; a -&gt; Int
 	><span class="annottext"
 	  >norf :: [Int] -&gt; Int
 </span
-	  ><a href="#"
+	  ><a href="Classes.html#norf"
 	  ><span class="hs-identifier hs-var hs-var hs-var hs-var"
 	    >norf</span
 	    ></a
@@ -813,6 +815,7 @@ forall a. Foo a =&gt; a -&gt; Int
       ><span class="annot"
       ><span class="annottext"
 	>[Int] -&gt; Int
+forall a. Num a =&gt; [a] -&gt; a
 forall (t :: * -&gt; *) a. (Foldable t, Num a) =&gt; t a -&gt; a
 </span
 	><span class="hs-identifier hs-var"
@@ -870,7 +873,7 @@ forall (t :: * -&gt; *) a. (Foldable t, Num a) =&gt; t a -&gt; a
 	><span class="annottext"
 	  >quux :: ([a], [a]) -&gt; [a]
 </span
-	  ><a href="#"
+	  ><a href="Classes.html#quux"
 	  ><span class="hs-identifier hs-var hs-var hs-var hs-var"
 	    >quux</span
 	    ></a
@@ -1118,7 +1121,7 @@ forall a. [a] -&gt; [a] -&gt; [a]
 	><span class="annottext"
 	  >plugh :: forall a b. Either a a -&gt; Either b b -&gt; Either (a -&gt; b) (b -&gt; a)
 </span
-	  ><a href="#"
+	  ><a href="Classes.html#plugh"
 	  ><span class="hs-identifier hs-var hs-var hs-var hs-var"
 	    >plugh</span
 	    ></a
diff --git a/hypsrc-test/ref/src/Constructors.html b/hypsrc-test/ref/src/Constructors.html
index d5c3dd33..e3bb22d8 100644
--- a/hypsrc-test/ref/src/Constructors.html
+++ b/hypsrc-test/ref/src/Constructors.html
@@ -1309,6 +1309,7 @@ forall a. Num a =&gt; a -&gt; a -&gt; a
       ><span class="annot"
       ><span class="annottext"
 	>[Int] -&gt; Int
+forall a. Num a =&gt; [a] -&gt; a
 forall (t :: * -&gt; *) a. (Foldable t, Num a) =&gt; t a -&gt; a
 </span
 	><span class="hs-identifier hs-var"
diff --git a/hypsrc-test/ref/src/Quasiquoter.html b/hypsrc-test/ref/src/Quasiquoter.html
index 53c05de1..76faac5a 100644
--- a/hypsrc-test/ref/src/Quasiquoter.html
+++ b/hypsrc-test/ref/src/Quasiquoter.html
@@ -80,8 +80,10 @@
 </span
       ><span id="line-7"
       ></span
+      ><span class="annot"
       ><span class="hs-comment"
-      >-- | Quoter for constructing multiline string literals</span
+	>-- | Quoter for constructing multiline string literals</span
+	></span
       ><span
       >
 </span
@@ -156,6 +158,7 @@
       ><span class="annot"
       ><span class="annottext"
 	>Exp -&gt; Q Exp
+forall a. a -&gt; Q a
 forall (f :: * -&gt; *) a. Applicative f =&gt; a -&gt; f a
 </span
 	><span class="hs-identifier hs-var"
@@ -398,6 +401,7 @@ forall a. String -&gt; Q a
       ><span class="annot"
       ><span class="annottext"
 	>String -&gt; Q a
+forall a. String -&gt; Q a
 forall (m :: * -&gt; *) a. MonadFail m =&gt; String -&gt; m a
 </span
 	><span class="hs-identifier hs-var"
diff --git a/hypsrc-test/ref/src/Records.html b/hypsrc-test/ref/src/Records.html
index 9adf02de..256b952f 100644
--- a/hypsrc-test/ref/src/Records.html
+++ b/hypsrc-test/ref/src/Records.html
@@ -623,10 +623,10 @@ forall a. Num a =&gt; a -&gt; a -&gt; a
       ><span class="annot"
 	><span class="annottext"
 	  >Int
-x :: Int
 x :: Point -&gt; Int
+x :: Int
 </span
-	  ><a href="#"
+	  ><a href="Records.html#x"
 	  ><span class="hs-identifier hs-var hs-var"
 	    >x</span
 	    ></a
@@ -640,10 +640,10 @@ x :: Point -&gt; Int
       ><span class="annot"
 	><span class="annottext"
 	  >Int
-y :: Int
 y :: Point -&gt; Int
+y :: Int
 </span
-	  ><a href="#"
+	  ><a href="Records.html#y"
 	  ><span class="hs-identifier hs-var hs-var"
 	    >y</span
 	    ></a
@@ -1301,12 +1301,12 @@ forall a. Num a =&gt; a -&gt; a -&gt; a
 	><span class="annot"
 	  ><span class="annottext"
 	    >Int
-y :: Int
-x :: Int
-y :: Point -&gt; Int
 x :: Point -&gt; Int
+y :: Point -&gt; Int
+x :: Int
+y :: Int
 </span
-	    ><a href="#"
+	    ><a href="Records.html#x"
 	    ><span class="hs-glyph hs-var hs-var hs-var hs-var"
 	      >..</span
 	      ></a
diff --git a/hypsrc-test/ref/src/UsingQuasiquotes.html b/hypsrc-test/ref/src/UsingQuasiquotes.html
index 1e7aef2c..b3ce68ec 100644
--- a/hypsrc-test/ref/src/UsingQuasiquotes.html
+++ b/hypsrc-test/ref/src/UsingQuasiquotes.html
@@ -78,7 +78,10 @@
       ><span
       > </span
       ><span class="annot"
-      ><span class=""
+      ><span class="annottext"
+	>[Char]
+</span
+	><span class=""
 	>[string| foo bar |]</span
 	></span
       ><span
@@ -94,7 +97,10 @@ forall a. [a] -&gt; [a] -&gt; [a]
       ><span
       > </span
       ><span class="annot"
-      ><span class=""
+      ><span class="annottext"
+	>[Char]
+</span
+	><span class=""
 	>[string| some
   mulitline
   quasiquote