testsuite: Update expected output for simplified subsumption

Author: bgamari

html-test/ref/Bug280.html

@@ -65,9 +65,9 @@
 	><p class="src"
 	  ><a id="v:x" class="def"
 	    >x</a
-	    > :: [<a href="#" title="Data.Char"
-	    >Char</a
-	    >] <a href="#" class="selflink"
+	    > :: <a href="#" title="Data.String"
+	    >String</a
+	    > <a href="#" class="selflink"
 	    >#</a
 	    ></p
 	  ></div

html-test/src/FunArgs.hs

@@ -22,7 +22,7 @@ h :: forall a b c
   -> b -- ^ Second argument
   -> c -- ^ Third argument
   -> forall d. d -- ^ Result
-h = undefined
+h _ _ _ = undefined
 
 
 i :: forall a (b :: ()) d. (d ~ '())

hypsrc-test/ref/src/Classes.html

@@ -1109,7 +1109,7 @@
       ><span id=""
       ><span class="annot"
 	><span class="annottext"
-	  >plugh :: Either a a -&gt; Either b b -&gt; Either (a -&gt; b) (b -&gt; a)
+	  >plugh :: forall a b. Either a a -&gt; Either b b -&gt; Either (a -&gt; b) (b -&gt; a)
 </span
 	  ><a href="#"
 	  ><span class="hs-identifier hs-var hs-var hs-var hs-var"

hypsrc-test/ref/src/Literals.html

@@ -132,7 +132,7 @@
       ><span id="num"
       ><span class="annot"
 	><span class="annottext"
-	  >num :: a
+	  >num :: forall a. Num a =&gt; a
 </span
 	  ><a href="Literals.html#num"
 	  ><span class="hs-identifier hs-var hs-var"
@@ -285,7 +285,7 @@
       ><span id="frac"
       ><span class="annot"
 	><span class="annottext"
-	  >frac :: a
+	  >frac :: forall a. Fractional a =&gt; a
 </span
 	  ><a href="Literals.html#frac"
 	  ><span class="hs-identifier hs-var hs-var"
@@ -360,7 +360,7 @@
       ><span id="list"
       ><span class="annot"
 	><span class="annottext"
-	  >list :: [[[[a]]]]
+	  >list :: forall a. [[[[a]]]]
 </span
 	  ><a href="Literals.html#list"
 	  ><span class="hs-identifier hs-var hs-var"

hypsrc-test/ref/src/Operators.html

@@ -108,7 +108,7 @@
       ><span id="%2B%2B%2B"
       ><span class="annot"
 	><span class="annottext"
-	  >+++ :: [a] -&gt; [a] -&gt; [a]
+	  >+++ :: forall a. [a] -&gt; [a] -&gt; [a]
 </span
 	  ><a href="Operators.html#%2B%2B%2B"
 	  ><span class="hs-operator hs-var hs-var"
@@ -273,7 +273,7 @@
       ><span id="%24%24%24"
       ><span class="annot"
 	><span class="annottext"
-	  >$$$ :: [a] -&gt; [a] -&gt; [a]
+	  >$$$ :: forall a. [a] -&gt; [a] -&gt; [a]
 </span
 	  ><a href="Operators.html#%24%24%24"
 	  ><span class="hs-operator hs-var hs-var"
@@ -406,7 +406,7 @@
       ><span id="%2A%2A%2A"
       ><span class="annot"
 	><span class="annottext"
-	  >*** :: [a] -&gt; [a] -&gt; [a]
+	  >*** :: forall a. [a] -&gt; [a] -&gt; [a]
 </span
 	  ><a href="Operators.html#%2A%2A%2A"
 	  ><span class="hs-operator hs-var hs-var"
@@ -656,7 +656,7 @@
       ><span id="%2A%2F%5C%2A"
       ><span class="annot"
 	><span class="annottext"
-	  >*/\* :: [[a]] -&gt; [a] -&gt; [a]
+	  >*/\* :: forall a. [[a]] -&gt; [a] -&gt; [a]
 </span
 	  ><a href="Operators.html#%2A%2F%5C%2A"
 	  ><span class="hs-operator hs-var hs-var"
@@ -828,7 +828,7 @@
       ><span id="%2A%2A%2F%5C%2A%2A"
       ><span class="annot"
 	><span class="annottext"
-	  >**/\** :: [[a]] -&gt; [[a]] -&gt; [[a]]
+	  >**/\** :: forall a. [[a]] -&gt; [[a]] -&gt; [[a]]
 </span
 	  ><a href="Operators.html#%2A%2A%2F%5C%2A%2A"
 	  ><span class="hs-operator hs-var hs-var"
@@ -1065,7 +1065,7 @@
       ><span id="%23.%23"
       ><span class="annot"
 	><span class="annottext"
-	  >#.# :: a -&gt; b -&gt; c -&gt; (a, b)
+	  >#.# :: forall a b c. a -&gt; b -&gt; c -&gt; (a, b)
 </span
 	  ><a href="Operators.html#%23.%23"
 	  ><span class="hs-operator hs-var hs-var"

hypsrc-test/ref/src/Polymorphism.html

@@ -107,7 +107,7 @@
       ><span id="foo"
       ><span class="annot"
 	><span class="annottext"
-	  >foo :: a -&gt; a -&gt; a
+	  >foo :: forall a. a -&gt; a -&gt; a
 </span
 	  ><a href="Polymorphism.html#foo"
 	  ><span class="hs-identifier hs-var hs-var"
@@ -205,7 +205,7 @@
       ><span id="foo%27"
       ><span class="annot"
 	><span class="annottext"
-	  >foo' :: a -&gt; a -&gt; a
+	  >foo' :: forall a. a -&gt; a -&gt; a
 </span
 	  ><a href="Polymorphism.html#foo%27"
 	  ><span class="hs-identifier hs-var hs-var"
@@ -305,7 +305,7 @@
       ><span id="bar"
       ><span class="annot"
 	><span class="annottext"
-	  >bar :: a -&gt; b -&gt; (a, b)
+	  >bar :: forall a b. a -&gt; b -&gt; (a, b)
 </span
 	  ><a href="Polymorphism.html#bar"
 	  ><span class="hs-identifier hs-var hs-var"
@@ -427,7 +427,7 @@
       ><span id="bar%27"
       ><span class="annot"
 	><span class="annottext"
-	  >bar' :: a -&gt; b -&gt; (a, b)
+	  >bar' :: forall a b. a -&gt; b -&gt; (a, b)
 </span
 	  ><a href="Polymorphism.html#bar%27"
 	  ><span class="hs-identifier hs-var hs-var"
@@ -557,7 +557,7 @@
       ><span id="baz"
       ><span class="annot"
 	><span class="annottext"
-	  >baz :: a -&gt; (a -&gt; [a -&gt; a] -&gt; b) -&gt; b
+	  >baz :: forall a b. a -&gt; (a -&gt; [a -&gt; a] -&gt; b) -&gt; b
 </span
 	  ><a href="Polymorphism.html#baz"
 	  ><span class="hs-identifier hs-var hs-var"
@@ -709,7 +709,7 @@
       ><span id="baz%27"
       ><span class="annot"
 	><span class="annottext"
-	  >baz' :: a -&gt; (a -&gt; [a -&gt; a] -&gt; b) -&gt; b
+	  >baz' :: forall a b. a -&gt; (a -&gt; [a -&gt; a] -&gt; b) -&gt; b
 </span
 	  ><a href="Polymorphism.html#baz%27"
 	  ><span class="hs-identifier hs-var hs-var"
@@ -825,7 +825,7 @@
       ><span id="quux"
       ><span class="annot"
 	><span class="annottext"
-	  >quux :: a -&gt; (forall a. a -&gt; a) -&gt; a
+	  >quux :: forall a. a -&gt; (forall a. a -&gt; a) -&gt; a
 </span
 	  ><a href="Polymorphism.html#quux"
 	  ><span class="hs-identifier hs-var hs-var"
@@ -994,7 +994,7 @@
       ><span id="quux%27"
       ><span class="annot"
 	><span class="annottext"
-	  >quux' :: a -&gt; (forall a. a -&gt; a) -&gt; a
+	  >quux' :: forall a. a -&gt; (forall a. a -&gt; a) -&gt; a
 </span
 	  ><a href="Polymorphism.html#quux%27"
 	  ><span class="hs-identifier hs-var hs-var"
@@ -1140,7 +1140,7 @@
       ><span id="num"
       ><span class="annot"
 	><span class="annottext"
-	  >num :: a -&gt; a -&gt; a
+	  >num :: forall a. Num a =&gt; a -&gt; a -&gt; a
 </span
 	  ><a href="Polymorphism.html#num"
 	  ><span class="hs-identifier hs-var hs-var"
@@ -1256,7 +1256,7 @@
       ><span id="num%27"
       ><span class="annot"
 	><span class="annottext"
-	  >num' :: a -&gt; a -&gt; a
+	  >num' :: forall a. Num a =&gt; a -&gt; a -&gt; a
 </span
 	  ><a href="Polymorphism.html#num%27"
 	  ><span class="hs-identifier hs-var hs-var"
@@ -1402,7 +1402,7 @@
       ><span id="eq"
       ><span class="annot"
 	><span class="annottext"
-	  >eq :: [a] -&gt; [b] -&gt; (a, b)
+	  >eq :: forall a b. (Eq a, Eq b) =&gt; [a] -&gt; [b] -&gt; (a, b)
 </span
 	  ><a href="Polymorphism.html#eq"
 	  ><span class="hs-identifier hs-var hs-var"
@@ -1570,7 +1570,7 @@
       ><span id="eq%27"
       ><span class="annot"
 	><span class="annottext"
-	  >eq' :: [a] -&gt; [b] -&gt; (a, b)
+	  >eq' :: forall a b. (Eq a, Eq b) =&gt; [a] -&gt; [b] -&gt; (a, b)
 </span
 	  ><a href="Polymorphism.html#eq%27"
 	  ><span class="hs-identifier hs-var hs-var"
@@ -1694,7 +1694,7 @@
       ><span id="mon"
       ><span class="annot"
 	><span class="annottext"
-	  >mon :: (a -&gt; m a) -&gt; m a
+	  >mon :: forall (m :: * -&gt; *) a. Monad m =&gt; (a -&gt; m a) -&gt; m a
 </span
 	  ><a href="Polymorphism.html#mon"
 	  ><span class="hs-identifier hs-var hs-var"
@@ -1840,7 +1840,7 @@
       ><span id="mon%27"
       ><span class="annot"
 	><span class="annottext"
-	  >mon' :: (a -&gt; m a) -&gt; m a
+	  >mon' :: forall (m :: * -&gt; *) a. Monad m =&gt; (a -&gt; m a) -&gt; m a
 </span
 	  ><a href="Polymorphism.html#mon%27"
 	  ><span class="hs-identifier hs-var hs-var"
@@ -1979,7 +1979,7 @@
       ><span id="norf"
       ><span class="annot"
 	><span class="annottext"
-	  >norf :: a -&gt; (forall a. Ord a =&gt; a -&gt; a) -&gt; a
+	  >norf :: forall a. a -&gt; (forall a. Ord a =&gt; a -&gt; a) -&gt; a
 </span
 	  ><a href="Polymorphism.html#norf"
 	  ><span class="hs-identifier hs-var hs-var"
@@ -2154,7 +2154,7 @@
       ><span id="norf%27"
       ><span class="annot"
 	><span class="annottext"
-	  >norf' :: a -&gt; (forall a. Ord a =&gt; a -&gt; a) -&gt; a
+	  >norf' :: forall a. a -&gt; (forall a. Ord a =&gt; a -&gt; a) -&gt; a
 </span
 	  ><a href="Polymorphism.html#norf%27"
 	  ><span class="hs-identifier hs-var hs-var"
@@ -2272,7 +2272,7 @@
       ><span id="plugh"
       ><span class="annot"
 	><span class="annottext"
-	  >plugh :: a -&gt; a
+	  >plugh :: forall a. a -&gt; a
 </span
 	  ><a href="Polymorphism.html#plugh"
 	  ><span class="hs-identifier hs-var hs-var"
@@ -2436,7 +2436,7 @@
       ><span id="thud"
       ><span class="annot"
 	><span class="annottext"
-	  >thud :: (a -&gt; b) -&gt; a -&gt; (a, b)
+	  >thud :: forall a b. (a -&gt; b) -&gt; a -&gt; (a, b)
 </span
 	  ><a href="Polymorphism.html#thud"
 	  ><span class="hs-identifier hs-var hs-var"