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

1 files changed, 38 insertions, 32 deletions

diff --git a/html-test/ref/TypeFamilies3.html b/html-test/ref/TypeFamilies3.html
index 88e74dd9..5e2d1ea7 100644
--- a/html-test/ref/TypeFamilies3.html
+++ b/html-test/ref/TypeFamilies3.html
@@ -38,6 +38,12 @@
 	    ><td
 	    >Safe-Inferred</td
 	    ></tr
+	  ><tr
+	  ><th
+	    >Language</th
+	    ><td
+	    >Haskell2010</td
+	    ></tr
 	  ></table
 	><p class="caption"
 	>TypeFamilies3</p
@@ -142,9 +148,7 @@
 		      >type</span
 		      > <a href="#" title="TypeFamilies3"
 		      >Bar</a
-		      > <a href="#" title="Data.Int"
-		      >Int</a
-		      ></span
+		      > ()</span
 		    > <a href="#" class="selflink"
 		    >#</a
 		    ></td
@@ -165,9 +169,9 @@
 			>type</span
 			> <a href="#" title="TypeFamilies3"
 			>Bar</a
-			> <a href="#" title="Data.Int"
+			> () = <a href="#" title="Data.Int"
 			>Int</a
-			> = ()</div
+			></div
 		      ></details
 		    ></td
 		  ></tr
@@ -180,7 +184,9 @@
 		      >type</span
 		      > <a href="#" title="TypeFamilies3"
 		      >Bar</a
-		      > ()</span
+		      > <a href="#" title="Data.Int"
+		      >Int</a
+		      ></span
 		    > <a href="#" class="selflink"
 		    >#</a
 		    ></td
@@ -201,9 +207,9 @@
 			>type</span
 			> <a href="#" title="TypeFamilies3"
 			>Bar</a
-			> () = <a href="#" title="Data.Int"
+			> <a href="#" title="Data.Int"
 			>Int</a
-			></div
+			> = ()</div
 		      ></details
 		    ></td
 		  ></tr
@@ -237,12 +243,10 @@
 		    ><span class="instance details-toggle-control details-toggle" data-details-id="i:if:Baz:Baz:1"
 		      ></span
 		      > <span class="keyword"
-		      >newtype</span
+		      >data</span
 		      > <a href="#" title="TypeFamilies3"
 		      >Baz</a
-		      > <a href="#" title="Prelude"
-		      >Double</a
-		      ></span
+		      > ()</span
 		    > <a href="#" class="selflink"
 		    >#</a
 		    ></td
@@ -260,15 +264,11 @@
 			></p
 		      > <div class="src"
 		      ><span class="keyword"
-			>newtype</span
+			>data</span
 			> <a href="#" title="TypeFamilies3"
 			>Baz</a
-			> <a href="#" title="Prelude"
-			>Double</a
-			> = <a id="v:Baz3" class="def"
-			>Baz3</a
-			> <a href="#" title="Prelude"
-			>Float</a
+			> () = <a id="v:Baz1" class="def"
+			>Baz1</a
 			></div
 		      ></details
 		    ></td
@@ -279,11 +279,11 @@
 		    ><span class="instance details-toggle-control details-toggle" data-details-id="i:if:Baz:Baz:2"
 		      ></span
 		      > <span class="keyword"
-		      >data</span
+		      >newtype</span
 		      > <a href="#" title="TypeFamilies3"
 		      >Baz</a
-		      > <a href="#" title="Data.Int"
-		      >Int</a
+		      > <a href="#" title="Prelude"
+		      >Double</a
 		      ></span
 		    > <a href="#" class="selflink"
 		    >#</a
@@ -302,15 +302,15 @@
 			></p
 		      > <div class="src"
 		      ><span class="keyword"
-			>data</span
+			>newtype</span
 			> <a href="#" title="TypeFamilies3"
 			>Baz</a
-			> <a href="#" title="Data.Int"
-			>Int</a
-			> = <a id="v:Baz2" class="def"
-			>Baz2</a
-			> <a href="#" title="Data.Bool"
-			>Bool</a
+			> <a href="#" title="Prelude"
+			>Double</a
+			> = <a id="v:Baz3" class="def"
+			>Baz3</a
+			> <a href="#" title="Prelude"
+			>Float</a
 			></div
 		      ></details
 		    ></td
@@ -324,7 +324,9 @@
 		      >data</span
 		      > <a href="#" title="TypeFamilies3"
 		      >Baz</a
-		      > ()</span
+		      > <a href="#" title="Data.Int"
+		      >Int</a
+		      ></span
 		    > <a href="#" class="selflink"
 		    >#</a
 		    ></td
@@ -345,8 +347,12 @@
 			>data</span
 			> <a href="#" title="TypeFamilies3"
 			>Baz</a
-			> () = <a id="v:Baz1" class="def"
-			>Baz1</a
+			> <a href="#" title="Data.Int"
+			>Int</a
+			> = <a id="v:Baz2" class="def"
+			>Baz2</a
+			> <a href="#" title="Data.Bool"
+			>Bool</a
 			></div
 		      ></details
 		    ></td