Merge pull request #857 from sjakobi/ghc-head-update-3

Update ghc-head

1 files changed, 65 insertions, 103 deletions

diff --git a/html-test/ref/Hash.html b/html-test/ref/Hash.html
index 21004e20..c4f04f2c 100644
--- a/html-test/ref/Hash.html
+++ b/html-test/ref/Hash.html
@@ -87,37 +87,23 @@
 	    ><li class="src short"
 	    ><a href="#"
 	      >new</a
-	      > :: (<a href="#"
-	      >Eq</a
-	      > key, <a href="#"
+	      > :: (Eq key, <a href="#" title="Hash"
 	      >Hash</a
-	      > key) =&gt; <a href="#"
-	      >Int</a
-	      > -&gt; <a href="#"
-	      >IO</a
-	      > (<a href="#"
+	      > key) =&gt; Int -&gt; IO (<a href="#" title="Hash"
 	      >HashTable</a
 	      > key val)</li
 	    ><li class="src short"
 	    ><a href="#"
 	      >insert</a
-	      > :: (<a href="#"
-	      >Eq</a
-	      > key, <a href="#"
+	      > :: (Eq key, <a href="#" title="Hash"
 	      >Hash</a
-	      > key) =&gt; key -&gt; val -&gt; <a href="#"
-	      >IO</a
-	      > ()</li
+	      > key) =&gt; key -&gt; val -&gt; IO ()</li
 	    ><li class="src short"
 	    ><a href="#"
 	      >lookup</a
-	      > :: <a href="#"
+	      > :: <a href="#" title="Hash"
 	      >Hash</a
-	      > key =&gt; key -&gt; <a href="#"
-	      >IO</a
-	      > (<a href="#"
-	      >Maybe</a
-	      > val)</li
+	      > key =&gt; key -&gt; IO (Maybe val)</li
 	    ><li class="src short"
 	    ><span class="keyword"
 	      >class</span
@@ -126,16 +112,22 @@
 	      > a <span class="keyword"
 	      >where</span
 	      ><ul class="subs"
-	      ></ul
+	      ><li
+		><a href="#"
+		  >hash</a
+		  > :: a -&gt; Int</li
+		></ul
 	      ></li
 	    ></ul
 	  ></details
 	></div
       ><div id="interface"
-      ><h1 id="g:1"
-	>The <code
-	  >HashTable</code
-	  > type</h1
+      ><a href="#" id="g:1"
+	><h1
+	  >The <code
+	    >HashTable</code
+	    > type</h1
+	  ></a
 	><div class="top"
 	><p class="src"
 	  ><span class="keyword"
@@ -155,29 +147,23 @@
  The type <code
 	      >key</code
 	      > should be an instance of <code
-	      ><a href="#"
-		>Eq</a
-		></code
+	      >Eq</code
 	      >.</p
 	    ></div
 	  ></div
-	><h2 id="g:2"
-	>Operations on <code
-	  >HashTable</code
-	  >s</h2
+	><a href="#" id="g:2"
+	><h2
+	  >Operations on <code
+	    >HashTable</code
+	    >s</h2
+	  ></a
 	><div class="top"
 	><p class="src"
 	  ><a id="v:new" class="def"
 	    >new</a
-	    > :: (<a href="#"
-	    >Eq</a
-	    > key, <a href="#"
+	    > :: (Eq key, <a href="#" title="Hash"
 	    >Hash</a
-	    > key) =&gt; <a href="#"
-	    >Int</a
-	    > -&gt; <a href="#"
-	    >IO</a
-	    > (<a href="#"
+	    > key) =&gt; Int -&gt; IO (<a href="#" title="Hash"
 	    >HashTable</a
 	    > key val) <a href="#" class="selflink"
 	    >#</a
@@ -191,13 +177,9 @@
 	><p class="src"
 	  ><a id="v:insert" class="def"
 	    >insert</a
-	    > :: (<a href="#"
-	    >Eq</a
-	    > key, <a href="#"
+	    > :: (Eq key, <a href="#" title="Hash"
 	    >Hash</a
-	    > key) =&gt; key -&gt; val -&gt; <a href="#"
-	    >IO</a
-	    > () <a href="#" class="selflink"
+	    > key) =&gt; key -&gt; val -&gt; IO () <a href="#" class="selflink"
 	    >#</a
 	    ></p
 	  ><div class="doc"
@@ -209,35 +191,29 @@
 	><p class="src"
 	  ><a id="v:lookup" class="def"
 	    >lookup</a
-	    > :: <a href="#"
+	    > :: <a href="#" title="Hash"
 	    >Hash</a
-	    > key =&gt; key -&gt; <a href="#"
-	    >IO</a
-	    > (<a href="#"
-	    >Maybe</a
-	    > val) <a href="#" class="selflink"
+	    > key =&gt; key -&gt; IO (Maybe val) <a href="#" class="selflink"
 	    >#</a
 	    ></p
 	  ><div class="doc"
 	  ><p
 	    >Looks up a key in the hash table, returns <code
 	      ><code
-		><a href="#"
-		  >Just</a
-		  ></code
+		>Just</code
 		> val</code
 	      > if the key
  was found, or <code
-	      ><a href="#"
-		>Nothing</a
-		></code
+	      >Nothing</code
 	      > otherwise.</p
 	    ></div
 	  ></div
-	><h1 id="g:3"
-	>The <code
-	  >Hash</code
-	  > class</h1
+	><a href="#" id="g:3"
+	><h1
+	  >The <code
+	    >Hash</code
+	    > class</h1
+	  ></a
 	><div class="top"
 	><p class="src"
 	  ><span class="keyword"
@@ -253,23 +229,13 @@
 	  ><p
 	    >A class of types which can be hashed.</p
 	    ></div
-	  ><div class="subs minimal"
-	  ><p class="caption"
-	    >Minimal complete definition</p
-	    ><p class="src"
-	    ><a href="#"
-	      >hash</a
-	      ></p
-	    ></div
 	  ><div class="subs methods"
 	  ><p class="caption"
 	    >Methods</p
 	    ><p class="src"
 	    ><a id="v:hash" class="def"
 	      >hash</a
-	      > :: a -&gt; <a href="#"
-	      >Int</a
-	      > <a href="#" class="selflink"
+	      > :: a -&gt; Int <a href="#" class="selflink"
 	      >#</a
 	      ></p
 	    ><div class="doc"
@@ -277,9 +243,7 @@
 	      >hashes the value of type <code
 		>a</code
 		> into an <code
-		><a href="#"
-		  >Int</a
-		  ></code
+		>Int</code
 		></p
 	      ></div
 	    ></div
@@ -293,11 +257,9 @@
 		  ><span class="inst-left"
 		    ><span class="instance details-toggle-control details-toggle" data-details-id="i:ic:Hash:Hash:1"
 		      ></span
-		      > <a href="#"
+		      > <a href="#" title="Hash"
 		      >Hash</a
-		      > <a href="#"
-		      >Float</a
-		      ></span
+		      > Float</span
 		    > <a href="#" class="selflink"
 		    >#</a
 		    ></td
@@ -309,17 +271,17 @@
 		  ><details id="i:ic:Hash:Hash:1"
 		    ><summary class="hide-when-js-enabled"
 		      >Instance details</summary
-		      ><div class="subs methods"
+		      ><p
+		      >Defined in <a href="#"
+			>Hash</a
+			></p
+		      > <div class="subs methods"
 		      ><p class="caption"
 			>Methods</p
 			><p class="src"
 			><a href="#"
 			  >hash</a
-			  > :: <a href="#"
-			  >Float</a
-			  > -&gt; <a href="#"
-			  >Int</a
-			  > <a href="#" class="selflink"
+			  > :: Float -&gt; Int <a href="#" class="selflink"
 			  >#</a
 			  ></p
 			></div
@@ -331,11 +293,9 @@
 		  ><span class="inst-left"
 		    ><span class="instance details-toggle-control details-toggle" data-details-id="i:ic:Hash:Hash:2"
 		      ></span
-		      > <a href="#"
+		      > <a href="#" title="Hash"
 		      >Hash</a
-		      > <a href="#"
-		      >Int</a
-		      ></span
+		      > Int</span
 		    > <a href="#" class="selflink"
 		    >#</a
 		    ></td
@@ -347,17 +307,17 @@
 		  ><details id="i:ic:Hash:Hash:2"
 		    ><summary class="hide-when-js-enabled"
 		      >Instance details</summary
-		      ><div class="subs methods"
+		      ><p
+		      >Defined in <a href="#"
+			>Hash</a
+			></p
+		      > <div class="subs methods"
 		      ><p class="caption"
 			>Methods</p
 			><p class="src"
 			><a href="#"
 			  >hash</a
-			  > :: <a href="#"
-			  >Int</a
-			  > -&gt; <a href="#"
-			  >Int</a
-			  > <a href="#" class="selflink"
+			  > :: Int -&gt; Int <a href="#" class="selflink"
 			  >#</a
 			  ></p
 			></div
@@ -369,11 +329,11 @@
 		  ><span class="inst-left"
 		    ><span class="instance details-toggle-control details-toggle" data-details-id="i:ic:Hash:Hash:3"
 		      ></span
-		      > (<a href="#"
+		      > (<a href="#" title="Hash"
 		      >Hash</a
-		      > a, <a href="#"
+		      > a, <a href="#" title="Hash"
 		      >Hash</a
-		      > b) =&gt; <a href="#"
+		      > b) =&gt; <a href="#" title="Hash"
 		      >Hash</a
 		      > (a, b)</span
 		    > <a href="#" class="selflink"
@@ -387,15 +347,17 @@
 		  ><details id="i:ic:Hash:Hash:3"
 		    ><summary class="hide-when-js-enabled"
 		      >Instance details</summary
-		      ><div class="subs methods"
+		      ><p
+		      >Defined in <a href="#"
+			>Hash</a
+			></p
+		      > <div class="subs methods"
 		      ><p class="caption"
 			>Methods</p
 			><p class="src"
 			><a href="#"
 			  >hash</a
-			  > :: (a, b) -&gt; <a href="#"
-			  >Int</a
-			  > <a href="#" class="selflink"
+			  > :: (a, b) -&gt; Int <a href="#" class="selflink"
 			  >#</a
 			  ></p
 			></div