[commit: ghc] wip/spj-wildcard-refactor: Wibbles (43338e0)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : wip/spj-wildcard-refactor
Link       : http://ghc.haskell.org/trac/ghc/changeset/43338e00a279e5f3f0ab22daa328c5cb7efe3cff/ghc

>---------------------------------------------------------------

commit 43338e00a279e5f3f0ab22daa328c5cb7efe3cff
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Wed Nov 18 17:44:22 2015 +0000

    Wibbles


>---------------------------------------------------------------

43338e00a279e5f3f0ab22daa328c5cb7efe3cff
 compiler/main/HscTypes.hs                  | 2 ++
 testsuite/tests/perf/compiler/T5837.stderr | 8 ++++----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/compiler/main/HscTypes.hs b/compiler/main/HscTypes.hs
index 849c803..751b58d 100644
--- a/compiler/main/HscTypes.hs
+++ b/compiler/main/HscTypes.hs
@@ -1712,10 +1712,12 @@ implicitClassThings :: Class -> [TyThing]
 implicitClassThings cl
   = -- Does not include default methods, because those Ids may have
     --    their own pragmas, unfoldings etc, not derived from the Class object
+
     -- associated types
     --    No recursive call for the classATs, because they
     --    are only the family decls; they have no implicit things
     map ATyCon (classATs cl) ++
+
     -- superclass and operation selectors
     map AnId (classAllSelIds cl)
 
diff --git a/testsuite/tests/perf/compiler/T5837.stderr b/testsuite/tests/perf/compiler/T5837.stderr
index 7add7e3..324e817 100644
--- a/testsuite/tests/perf/compiler/T5837.stderr
+++ b/testsuite/tests/perf/compiler/T5837.stderr
@@ -1,5 +1,5 @@
 
-T5837.hs:8:6:
+T5837.hs:8:6: error:
     Reduction stack overflow; size = 51
     When simplifying the following type:
       TF
@@ -86,6 +86,6 @@ T5837.hs:8:6:
     (any upper bound you could choose might fail unpredictably with
      minor updates to GHC, so disabling the check is recommended if
      you're sure that type checking should terminate)
-    In the ambiguity check for the type signature for ‘t’:
-      t :: forall a. (a ~ TF (a, Int)) => Int
-    In the type signature for ‘t’: t :: (a ~ TF (a, Int)) => Int
+    In the ambiguity check for ‘t’
+    In the type signature:
+      t :: (a ~ TF (a, Int)) => Int