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

1 files changed, 104 insertions, 98 deletions

diff --git a/html-test/ref/TypeFamilies.html b/html-test/ref/TypeFamilies.html
index 7ca50972..faf41370 100644
--- a/html-test/ref/TypeFamilies.html
+++ b/html-test/ref/TypeFamilies.html
@@ -38,6 +38,12 @@
 	    ><td
 	    >Safe-Inferred</td
 	    ></tr
+	  ><tr
+	  ><th
+	    >Language</th
+	    ><td
+	    >Haskell2010</td
+	    ></tr
 	  ></table
 	><p class="caption"
 	>TypeFamilies</p
@@ -574,13 +580,13 @@
 		      ></span
 		      > <span class="keyword"
 		      >type</span
-		      > <a href="#" title="TypeFamilies"
-		      >X</a
+		      > '<a href="#" title="TypeFamilies"
+		      >XXX</a
 		      > <a href="#" title="TypeFamilies"
 		      >&lt;&gt;</a
-		      > (a :: <a href="#" title="Data.Kind"
-		      >Type</a
-		      >)</span
+		      > '<a href="#" title="TypeFamilies"
+		      >XX</a
+		      ></span
 		    > <a href="#" class="selflink"
 		    >#</a
 		    ></td
@@ -599,13 +605,13 @@
 		      > <div class="src"
 		      ><span class="keyword"
 			>type</span
-			> <a href="#" title="TypeFamilies"
-			>X</a
+			> '<a href="#" title="TypeFamilies"
+			>XXX</a
 			> <a href="#" title="TypeFamilies"
 			>&lt;&gt;</a
-			> (a :: <a href="#" title="Data.Kind"
-			>Type</a
-			>) = <a href="#" title="TypeFamilies"
+			> '<a href="#" title="TypeFamilies"
+			>XX</a
+			> = '<a href="#" title="TypeFamilies"
 			>X</a
 			></div
 		      ></details
@@ -618,13 +624,13 @@
 		      ></span
 		      > <span class="keyword"
 		      >type</span
-		      > '<a href="#" title="TypeFamilies"
-		      >XXX</a
+		      > <a href="#" title="TypeFamilies"
+		      >X</a
 		      > <a href="#" title="TypeFamilies"
 		      >&lt;&gt;</a
-		      > '<a href="#" title="TypeFamilies"
-		      >XX</a
-		      ></span
+		      > (a :: <a href="#" title="Data.Kind"
+		      >Type</a
+		      >)</span
 		    > <a href="#" class="selflink"
 		    >#</a
 		    ></td
@@ -643,13 +649,13 @@
 		      > <div class="src"
 		      ><span class="keyword"
 			>type</span
-			> '<a href="#" title="TypeFamilies"
-			>XXX</a
+			> <a href="#" title="TypeFamilies"
+			>X</a
 			> <a href="#" title="TypeFamilies"
 			>&lt;&gt;</a
-			> '<a href="#" title="TypeFamilies"
-			>XX</a
-			> = '<a href="#" title="TypeFamilies"
+			> (a :: <a href="#" title="Data.Kind"
+			>Type</a
+			>) = <a href="#" title="TypeFamilies"
 			>X</a
 			></div
 		      ></details
@@ -1151,14 +1157,14 @@
 		      > <a href="#" title="TypeFamilies"
 		      >Test</a
 		      > <a href="#" title="TypeFamilies"
-		      >Y</a
+		      >X</a
 		      ></span
 		    > <a href="#" class="selflink"
 		    >#</a
 		    ></td
 		  ><td class="doc"
 		  ><p
-		    >Doc for: instance Test Y</p
+		    >Doc for: instance Test X</p
 		    ></td
 		  ></tr
 		><tr
@@ -1181,14 +1187,14 @@
 		      > <a href="#" title="TypeFamilies"
 		      >Test</a
 		      > <a href="#" title="TypeFamilies"
-		      >X</a
+		      >Y</a
 		      ></span
 		    > <a href="#" class="selflink"
 		    >#</a
 		    ></td
 		  ><td class="doc"
 		  ><p
-		    >Doc for: instance Test X</p
+		    >Doc for: instance Test Y</p
 		    ></td
 		  ></tr
 		><tr
@@ -1237,14 +1243,14 @@
 		      > <a href="#" title="TypeFamilies"
 		      >Foo</a
 		      > <a href="#" title="TypeFamilies"
-		      >Y</a
+		      >X</a
 		      ></span
 		    > <a href="#" class="selflink"
 		    >#</a
 		    ></td
 		  ><td class="doc"
 		  ><p
-		    >Doc for: type instance Foo Y = X</p
+		    >Doc for: type instance Foo X = Y</p
 		    ></td
 		  ></tr
 		><tr
@@ -1262,9 +1268,9 @@
 			> <a href="#" title="TypeFamilies"
 			>Foo</a
 			> <a href="#" title="TypeFamilies"
-			>Y</a
-			> = <a href="#" title="TypeFamilies"
 			>X</a
+			> = <a href="#" title="TypeFamilies"
+			>Y</a
 			></div
 		      ></details
 		    ></td
@@ -1279,14 +1285,14 @@
 		      > <a href="#" title="TypeFamilies"
 		      >Foo</a
 		      > <a href="#" title="TypeFamilies"
-		      >X</a
+		      >Y</a
 		      ></span
 		    > <a href="#" class="selflink"
 		    >#</a
 		    ></td
 		  ><td class="doc"
 		  ><p
-		    >Doc for: type instance Foo X = Y</p
+		    >Doc for: type instance Foo Y = X</p
 		    ></td
 		  ></tr
 		><tr
@@ -1304,9 +1310,9 @@
 			> <a href="#" title="TypeFamilies"
 			>Foo</a
 			> <a href="#" title="TypeFamilies"
-			>X</a
-			> = <a href="#" title="TypeFamilies"
 			>Y</a
+			> = <a href="#" title="TypeFamilies"
+			>X</a
 			></div
 		      ></details
 		    ></td
@@ -1407,14 +1413,14 @@
 		      > <a href="#" title="TypeFamilies"
 		      >Bat</a
 		      > <a href="#" title="TypeFamilies"
-		      >Y</a
+		      >X</a
 		      ></span
 		    > <a href="#" class="selflink"
 		    >#</a
 		    ></td
 		  ><td class="doc"
 		  ><p
-		    >Doc for: data instance Bat Y</p
+		    >Doc for: data instance Bat X</p
 		    ></td
 		  ></tr
 		><tr
@@ -1432,11 +1438,33 @@
 			> <a href="#" title="TypeFamilies"
 			>Bat</a
 			> <a href="#" title="TypeFamilies"
-			>Y</a
-			> = <a id="v:BatY" class="def"
-			>BatY</a
-			> <a href="#" title="TypeFamilies"
-			>Y</a
+			>X</a
+			> <ul class="inst"
+			><li class="inst"
+			  >= <a id="v:BatX" class="def"
+			    >BatX</a
+			    > <a href="#" title="TypeFamilies"
+			    >X</a
+			    ></li
+			  ><li class="inst"
+			  >| <a id="v:BatXX" class="def"
+			    >BatXX</a
+			    > { <ul class="subs"
+			    ><li
+			      ><a id="v:aaa" class="def"
+				>aaa</a
+				> :: <a href="#" title="TypeFamilies"
+				>X</a
+				></li
+			      ><li
+			      ><a id="v:bbb" class="def"
+				>bbb</a
+				> :: <a href="#" title="TypeFamilies"
+				>Y</a
+				></li
+			      ></ul
+			    > }</li
+			  ></ul
 			></div
 		      ></details
 		    ></td
@@ -1451,14 +1479,14 @@
 		      > <a href="#" title="TypeFamilies"
 		      >Bat</a
 		      > <a href="#" title="TypeFamilies"
-		      >X</a
+		      >Y</a
 		      ></span
 		    > <a href="#" class="selflink"
 		    >#</a
 		    ></td
 		  ><td class="doc"
 		  ><p
-		    >Doc for: data instance Bat X</p
+		    >Doc for: data instance Bat Y</p
 		    ></td
 		  ></tr
 		><tr
@@ -1476,33 +1504,11 @@
 			> <a href="#" title="TypeFamilies"
 			>Bat</a
 			> <a href="#" title="TypeFamilies"
-			>X</a
-			> <ul class="inst"
-			><li class="inst"
-			  >= <a id="v:BatX" class="def"
-			    >BatX</a
-			    > <a href="#" title="TypeFamilies"
-			    >X</a
-			    ></li
-			  ><li class="inst"
-			  >| <a id="v:BatXX" class="def"
-			    >BatXX</a
-			    > { <ul class="subs"
-			    ><li
-			      ><a id="v:aaa" class="def"
-				>aaa</a
-				> :: <a href="#" title="TypeFamilies"
-				>X</a
-				></li
-			      ><li
-			      ><a id="v:bbb" class="def"
-				>bbb</a
-				> :: <a href="#" title="TypeFamilies"
-				>Y</a
-				></li
-			      ></ul
-			    > }</li
-			  ></ul
+			>Y</a
+			> = <a id="v:BatY" class="def"
+			>BatY</a
+			> <a href="#" title="TypeFamilies"
+			>Y</a
 			></div
 		      ></details
 		    ></td
@@ -1567,14 +1573,14 @@
 		      > <a href="#" title="TypeFamilies"
 		      >Assoc</a
 		      > <a href="#" title="TypeFamilies"
-		      >Y</a
+		      >X</a
 		      ></span
 		    > <a href="#" class="selflink"
 		    >#</a
 		    ></td
 		  ><td class="doc"
 		  ><p
-		    >Doc for: instance Assoc Y</p
+		    >Doc for: instance Assoc X</p
 		    ></td
 		  ></tr
 		><tr
@@ -1595,7 +1601,7 @@
 			  > <a href="#" title="TypeFamilies"
 			  >AssocD</a
 			  > <a href="#" title="TypeFamilies"
-			  >Y</a
+			  >X</a
 			  > <a href="#" class="selflink"
 			  >#</a
 			  ></p
@@ -1605,7 +1611,7 @@
 			  > <a href="#" title="TypeFamilies"
 			  >AssocT</a
 			  > <a href="#" title="TypeFamilies"
-			  >Y</a
+			  >X</a
 			  > <a href="#" class="selflink"
 			  >#</a
 			  ></p
@@ -1621,14 +1627,14 @@
 		      > <a href="#" title="TypeFamilies"
 		      >Assoc</a
 		      > <a href="#" title="TypeFamilies"
-		      >X</a
+		      >Y</a
 		      ></span
 		    > <a href="#" class="selflink"
 		    >#</a
 		    ></td
 		  ><td class="doc"
 		  ><p
-		    >Doc for: instance Assoc X</p
+		    >Doc for: instance Assoc Y</p
 		    ></td
 		  ></tr
 		><tr
@@ -1649,7 +1655,7 @@
 			  > <a href="#" title="TypeFamilies"
 			  >AssocD</a
 			  > <a href="#" title="TypeFamilies"
-			  >X</a
+			  >Y</a
 			  > <a href="#" class="selflink"
 			  >#</a
 			  ></p
@@ -1659,7 +1665,7 @@
 			  > <a href="#" title="TypeFamilies"
 			  >AssocT</a
 			  > <a href="#" title="TypeFamilies"
-			  >X</a
+			  >Y</a
 			  > <a href="#" class="selflink"
 			  >#</a
 			  ></p
@@ -1738,13 +1744,13 @@
 		      ></span
 		      > <span class="keyword"
 		      >type</span
-		      > <a href="#" title="TypeFamilies"
-		      >Y</a
+		      > '<a href="#" title="TypeFamilies"
+		      >XXX</a
 		      > <a href="#" title="TypeFamilies"
 		      >&lt;&gt;</a
-		      > (a :: <a href="#" title="Data.Kind"
-		      >Type</a
-		      >)</span
+		      > '<a href="#" title="TypeFamilies"
+		      >XX</a
+		      ></span
 		    > <a href="#" class="selflink"
 		    >#</a
 		    ></td
@@ -1763,13 +1769,15 @@
 		      > <div class="src"
 		      ><span class="keyword"
 			>type</span
-			> <a href="#" title="TypeFamilies"
-			>Y</a
+			> '<a href="#" title="TypeFamilies"
+			>XXX</a
 			> <a href="#" title="TypeFamilies"
 			>&lt;&gt;</a
-			> (a :: <a href="#" title="Data.Kind"
-			>Type</a
-			>) = a</div
+			> '<a href="#" title="TypeFamilies"
+			>XX</a
+			> = '<a href="#" title="TypeFamilies"
+			>X</a
+			></div
 		      ></details
 		    ></td
 		  ></tr
@@ -1824,13 +1832,13 @@
 		      ></span
 		      > <span class="keyword"
 		      >type</span
-		      > '<a href="#" title="TypeFamilies"
-		      >XXX</a
+		      > <a href="#" title="TypeFamilies"
+		      >Y</a
 		      > <a href="#" title="TypeFamilies"
 		      >&lt;&gt;</a
-		      > '<a href="#" title="TypeFamilies"
-		      >XX</a
-		      ></span
+		      > (a :: <a href="#" title="Data.Kind"
+		      >Type</a
+		      >)</span
 		    > <a href="#" class="selflink"
 		    >#</a
 		    ></td
@@ -1849,15 +1857,13 @@
 		      > <div class="src"
 		      ><span class="keyword"
 			>type</span
-			> '<a href="#" title="TypeFamilies"
-			>XXX</a
+			> <a href="#" title="TypeFamilies"
+			>Y</a
 			> <a href="#" title="TypeFamilies"
 			>&lt;&gt;</a
-			> '<a href="#" title="TypeFamilies"
-			>XX</a
-			> = '<a href="#" title="TypeFamilies"
-			>X</a
-			></div
+			> (a :: <a href="#" title="Data.Kind"
+			>Type</a
+			>) = a</div
 		      ></details
 		    ></td
 		  ></tr